Updated Branches: refs/heads/master c88a0a401 -> 99f5ea72a
WICKET-4770: remove very old hack for safari that no longer works and is no longer needed Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/99f5ea72 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/99f5ea72 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/99f5ea72 Branch: refs/heads/master Commit: 99f5ea72a36073861988caeaa62d8121b0608837 Parents: c88a0a4 Author: Emond Papegaaij <[email protected]> Authored: Tue Sep 25 08:26:10 2012 +0200 Committer: Emond Papegaaij <[email protected]> Committed: Tue Sep 25 08:26:10 2012 +0200 ---------------------------------------------------------------------- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 44 ++++++-------- .../extensions/ajax/markup/html/modal/res/modal.js | 2 +- 2 files changed, 20 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/99f5ea72/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 e126852..9c25205 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 @@ -2102,38 +2102,32 @@ var element = this; - // HACK - for safari stopPropagation doesn't work well because - // it also prevents scrollbars and form components getting the - // event. Therefore for safari the 'ignore' flag is set on event. - if (typeof(e.ignore) === "undefined") { + Wicket.Event.stop(e); - Wicket.Event.stop(e); - - if (e.preventDefault) { - e.preventDefault(); - } + if (e.preventDefault) { + e.preventDefault(); + } - element.wicketOnDragBegin(element); + element.wicketOnDragBegin(element); - element.lastMouseX = e.clientX; - element.lastMouseY = e.clientY; + element.lastMouseX = e.clientX; + element.lastMouseY = e.clientY; - element.old_onmousemove = document.onmousemove; - element.old_onmouseup = document.onmouseup; - element.old_onselectstart = document.onselectstart; - element.old_onmouseout = document.onmouseout; + element.old_onmousemove = document.onmousemove; + element.old_onmouseup = document.onmouseup; + element.old_onselectstart = document.onselectstart; + element.old_onmouseout = document.onmouseout; - document.onselectstart = function () { - return false; - }; - document.onmousemove = Wicket.Drag.mouseMove; - document.onmouseup = Wicket.Drag.mouseUp; - document.onmouseout = Wicket.Drag.mouseOut; + document.onselectstart = function () { + return false; + }; + document.onmousemove = Wicket.Drag.mouseMove; + document.onmouseup = Wicket.Drag.mouseUp; + document.onmouseout = Wicket.Drag.mouseOut; - Wicket.Drag.current = element; + Wicket.Drag.current = element; - return false; - } + return false; }, /** http://git-wip-us.apache.org/repos/asf/wicket/blob/99f5ea72/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 4f55f63..3f2ba19 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 @@ -1197,7 +1197,7 @@ "<div class=\"w_left\" id='"+idLeft+"'>"+ "<div class=\"w_right_1\">"+ "<div class=\"w_right\" id='"+idRight+"'>"+ - "<div class=\"w_content_1\" onmousedown=\"if (Wicket.Browser.isSafari()) { event.ignore = true; } else { Wicket.Event.stop(event); } \">"+ + "<div class=\"w_content_1\" onmousedown=\"Wicket.Event.stop(event);\">"+ "<div class=\"w_caption\" id=\""+idCaption+"\">"+ "<a class=\"w_close\" style=\"z-index:1\" href=\"#\"></a>"+ "<h3 id=\""+idCaptionText+"\" class=\"w_captionText\"></h3>"+
