Updated Branches: refs/heads/wicket-6.x 536f3334e -> 577129d98
Revert "Revert "WICKET-4948 fix vertical centering of modals in safari" safari seems to work fine now. WICKET-5224" This reverts commit 8fda26e515f83540ead654d997a5ffd8844ee839. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/577129d9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/577129d9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/577129d9 Branch: refs/heads/wicket-6.x Commit: 577129d983369de2b2344709a0adf8302a8c3844 Parents: 536f333 Author: Igor Vaynberg <[email protected]> Authored: Tue Dec 10 08:51:33 2013 -0800 Committer: Igor Vaynberg <[email protected]> Committed: Tue Dec 10 08:51:33 2013 -0800 ---------------------------------------------------------------------- .../wicket/extensions/ajax/markup/html/modal/res/modal.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/577129d9/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 1d147c1..538b783 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) { + if (Wicket.Browser.isIE() || 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()) { + if (Wicket.Browser.isIE() || Wicket.Browser.isGecko() || Wicket.Browser.isSafari()) { dx = Wicket.Window.getScrollX(); dy = Wicket.Window.getScrollY(); } @@ -483,7 +483,7 @@ 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(); }
