You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2014/03/13 08:18:36 UTC
[3/3] git commit: Merge branch 'wicket-6.x' of
https://github.com/niesink/wicket into wicket-6.x
Merge branch 'wicket-6.x' of https://github.com/niesink/wicket into wicket-6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3ce9f61b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3ce9f61b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3ce9f61b
Branch: refs/heads/wicket-6.x
Commit: 3ce9f61b24974e0e841cd05ab050ba3586fc36af
Parents: 622f1b0 a6565b6
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Thu Mar 13 08:18:12 2014 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Thu Mar 13 08:18:12 2014 +0100
----------------------------------------------------------------------
.../ajax/res/js/wicket-ajax-jquery-debug.js | 2 +-
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 4 ++--
.../wicket/ajax/res/js/wicket-event-jquery.js | 6 +++++-
wicket-core/src/test/js/event.js | 4 ++--
.../html/autocomplete/wicket-autocomplete.js | 2 +-
.../ajax/markup/html/modal/res/modal.js | 22 ++++++++++----------
6 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3ce9f61b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 23663a6,162c850..9d6fe0f
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@@ -2107,11 -2055,16 +2107,11 @@@
// serialize the style to string
var content = Wicket.DOM.serializeNodeChildren(node);
- // create style element
- var style = Wicket.Head.createElement("style");
-
- // copy id attribute
- style.id = node.getAttribute("id");
-
// create stylesheet
- if (Wicket.Browser.isIE()) {
+ if (Wicket.Browser.isIELessThan11()) {
try {
document.createStyleSheet().cssText = content;
+ return FunctionsExecuter.DONE;
}
catch (ignore) {
var run = function() {
http://git-wip-us.apache.org/repos/asf/wicket/blob/3ce9f61b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
----------------------------------------------------------------------