WICKET-4948 fix vertical centering of modals in safari
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c7f10f81 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c7f10f81 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c7f10f81 Branch: refs/heads/wicket-1.5.x Commit: c7f10f810b4b9b96d7ebd8f5b89a002205026af2 Parents: dd75b53 Author: Igor Vaynberg <[email protected]> Authored: Thu Dec 27 10:27:10 2012 -0800 Committer: Igor Vaynberg <[email protected]> Committed: Thu Dec 27 10:27:18 2012 -0800 ---------------------------------------------------------------------- .../extensions/ajax/markup/html/modal/res/modal.js | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c7f10f81/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 32946a9..42a67e1 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 @@ -116,7 +116,7 @@ Wicket.Iframe = { var dx = 0; var dy = 0; - if (Wicket.Browser.isIE() || Wicket.Browser.isGecko) { + if (Wicket.Browser.isIE() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { dx = Wicket.Window.getScrollX(); dy = Wicket.Window.getScrollY(); } @@ -133,7 +133,7 @@ Wicket.Iframe = { var dx = 0; var dy = 0; - if (Wicket.Browser.isIE() || Wicket.Browser.isGecko()) { + if (Wicket.Browser.isIE() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { dx = Wicket.Window.getScrollX(); dy = Wicket.Window.getScrollY(); } @@ -483,7 +483,7 @@ Wicket.Window.prototype = { var scTop = 0; var scLeft = 0; - if (Wicket.Browser.isIE() || Wicket.Browser.isGecko()) { + if (Wicket.Browser.isIE() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { scLeft = Wicket.Window.getScrollX(); scTop = Wicket.Window.getScrollY(); } @@ -505,6 +505,7 @@ Wicket.Window.prototype = { var left = (width / 2) - (modalWidth / 2) + scLeft; var top = (height / 2) - (modalHeight / 2) + scTop; + if (left < 0) left = 0; if (top < 0) top = 0;
