WICKET-5517 Use Wicket.Browser.isIELessThan11() as the behaviour of Wicket.Browser.isIE() has changed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a6565b62 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a6565b62 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a6565b62 Branch: refs/heads/wicket-6.x Commit: a6565b625581ea583006ac98e5d4dba9c7b730fc Parents: a8fcba3 Author: Luke Niesink <luke.nies...@topicus.nl> Authored: Tue Feb 25 16:16:35 2014 +0100 Committer: Luke Niesink <luke.nies...@topicus.nl> Committed: Tue Feb 25 16:16:35 2014 +0100 ---------------------------------------------------------------------- .../ajax/res/js/wicket-ajax-jquery-debug.js | 2 +- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 4 ++-- wicket-core/src/test/js/event.js | 4 ++-- .../html/autocomplete/wicket-autocomplete.js | 2 +- .../ajax/markup/html/modal/res/modal.js | 22 ++++++++++---------- 5 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a6565b62/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js index d9089d1..573b6ac 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js @@ -179,7 +179,7 @@ // Special style for Internet 6 and 7 in quirks mode - if (Wicket.Browser.isIE() && (Wicket.Browser.isIEQuirks() || !Wicket.Browser.isIE7())) { + if (Wicket.Browser.isIELessThan11() && (Wicket.Browser.isIEQuirks() || !Wicket.Browser.isIE7())) { html += "<a id='"+self.wicketDebugLink+"' style='position:absolute; right: 10px; bottom: 10px; z-index:1000000; padding-top: 0.3em; padding-bottom: 0.3em; line-height: normal ; _padding-top: 0em; width: 12em; border: 1px solid black; background-color: white; text-align: center; opacity: 0.7; filter: alpha(opacity=70); color: blue; " + " left: expression(-10 - wicketDebugLink.offsetWidth + eval(document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft) +(document.documentElement.clientWidth ? document.documentElement.clientWidth : document.body.clientWidth));"+ http://git-wip-us.apache.org/repos/asf/wicket/blob/a6565b62/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js ---------------------------------------------------------------------- diff --git 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 index 27f81cd..162c850 100644 --- 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 @@ -2062,7 +2062,7 @@ style.id = node.getAttribute("id"); // create stylesheet - if (Wicket.Browser.isIE()) { + if (Wicket.Browser.isIELessThan11()) { try { document.createStyleSheet().cssText = content; } @@ -2648,7 +2648,7 @@ setup: function () { - if (Wicket.Browser.isIE()) { + if (Wicket.Browser.isIELessThan11()) { jQuery(this).on('keydown', function (event) { jQuery.event.special.inputchange.keyDownPressed = true; http://git-wip-us.apache.org/repos/asf/wicket/blob/a6565b62/wicket-core/src/test/js/event.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/js/event.js b/wicket-core/src/test/js/event.js index b2e908c..8ea4f97 100644 --- a/wicket-core/src/test/js/event.js +++ b/wicket-core/src/test/js/event.js @@ -325,7 +325,7 @@ jQuery(document).ready(function() { test('inputchange', function() { stop(); - if (Wicket.Browser.isIE()) { + if (Wicket.Browser.isIELessThan11()) { expect(3); } else { expect(1); @@ -336,7 +336,7 @@ jQuery(document).ready(function() { ok(true, "inputchange event is triggered!"); }); - if (Wicket.Browser.isIE()) { + if (Wicket.Browser.isIELessThan11()) { $input.trigger("paste"); $input.trigger("keyup"); $input.trigger("cut"); http://git-wip-us.apache.org/repos/asf/wicket/blob/a6565b62/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js index 31176fa..4c7b552 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js @@ -696,7 +696,7 @@ hideIndicator(); // hack for a focus issue in IE, WICKET-2279 - if (Wicket.Browser.isIE()) { + if (Wicket.Browser.isIELessThan11()) { var range = document.selection.createRange(); if (range !== null) { range.select(); http://git-wip-us.apache.org/repos/asf/wicket/blob/a6565b62/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js index 65eebf8..34dce41 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js @@ -119,7 +119,7 @@ var dx = 0; var dy = 0; - if (Wicket.Browser.isIE() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { + if (Wicket.Browser.isIELessThan11() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { dx = Wicket.Window.getScrollX(); dy = Wicket.Window.getScrollY(); } @@ -137,7 +137,7 @@ var dx = 0; var dy = 0; - if (Wicket.Browser.isIE() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { + if (Wicket.Browser.isIELessThan11() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { dx = Wicket.Window.getScrollX(); dy = Wicket.Window.getScrollY(); } @@ -373,7 +373,7 @@ this.bottom = _(idBottom); this.captionText = _(idCaptionText); - if (Wicket.Browser.isIE()) { + if (Wicket.Browser.isIELessThan11()) { // IE stupid 3px bug - not fixed even in IE7 quirks! if (Wicket.Browser.isIE7() === false || Wicket.Browser.isIEQuirks()) { this.topLeft.style.marginRight = "-3px"; @@ -386,7 +386,7 @@ // HACK - IE doesn't support position:fixed. Gecko does, however for a reason // we need to have background position: absolute, which makes the movement of // the window really jerky if the window stays position: fixed - if (Wicket.Browser.isIE() || Wicket.Browser.isGecko()) { + if (Wicket.Browser.isIELessThan11() || Wicket.Browser.isGecko()) { this.window.style.position = "absolute"; } @@ -483,7 +483,7 @@ var scTop = 0; var scLeft = 0; - if (Wicket.Browser.isIE() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { + if (Wicket.Browser.isIELessThan11() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { scLeft = Wicket.Window.getScrollX(); scTop = Wicket.Window.getScrollY(); } @@ -844,7 +844,7 @@ this.adjustOpenWindowsStatusAndZIndexesOnClose(); - if (Wicket.Browser.isIE()) { + if (Wicket.Browser.isIELessThan11()) { // There's a strange focus problem in IE that disables focus on entire page, // unless something focuses an input var e = document.createElement("input"); @@ -908,7 +908,7 @@ * Called when dragging has started. */ onBegin: function(object) { - if (this.isIframe() && (Wicket.Browser.isGecko() || Wicket.Browser.isIE() || Wicket.Browser.isSafari())) { + if (this.isIframe() && (Wicket.Browser.isGecko() || Wicket.Browser.isIELessThan11() || Wicket.Browser.isSafari())) { this.revertList = []; Wicket.Iframe.documentFix(document, this.revertList); } @@ -1295,7 +1295,7 @@ // HACK - it really sucks that we have to set this to absolute even for gecko. // however background with position:fixed makes the text cursor in textfieds // in modal window disappear - if (Wicket.Browser.isIE() || Wicket.Browser.isGecko()) { + if (Wicket.Browser.isIELessThan11() || Wicket.Browser.isGecko()) { e.style.position = "absolute"; } @@ -1455,7 +1455,7 @@ return; } - if (Wicket.Browser.isIE() && Wicket.Browser.isIE7() === false) { + if (Wicket.Browser.isIELessThan11() && Wicket.Browser.isIE7() === false) { this.boxes = []; var selects = doc.getElementsByTagName("select"); for (var i = 0; i < selects.length; i++) { @@ -1513,7 +1513,7 @@ } // explorer doesn't need this, because for IE disableTabs() is called. // plus in IE this causes problems because it scrolls document ); - if (Wicket.Browser.isIE() === false) { + if (Wicket.Browser.isIELessThan11() === false) { this.focusRevertList = []; var body = doc.getElementsByTagName("body")[0]; for (var i = 0; i < body.childNodes.length; ++i) { @@ -1551,7 +1551,7 @@ if (typeof (this.tabbableTags) === "undefined") { this.tabbableTags = ["A", "BUTTON", "TEXTAREA", "INPUT", "IFRAME", "SELECT"]; } - if (Wicket.Browser.isIE()) { + if (Wicket.Browser.isIELessThan11()) { this.disabledTabsRevertList = []; for (var j = 0; j < this.tabbableTags.length; j++) { var tagElements = doc.getElementsByTagName(this.tabbableTags[j]);
