Updated Branches:
  refs/heads/master 333b4cd2c -> 61ebe2dbd

Revert "WICKET-5224 Revert "WICKET-4948 fix vertical centering of modals in 
safari""

This reverts commit 0cecd7fdfa449240f39aaa991c5f6c3046bc3c53.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/61ebe2db
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/61ebe2db
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/61ebe2db

Branch: refs/heads/master
Commit: 61ebe2dbd55ff2ff5ac6f73909708021bb1acf4d
Parents: 333b4cd
Author: Igor Vaynberg <[email protected]>
Authored: Tue Dec 10 09:03:59 2013 -0800
Committer: Igor Vaynberg <[email protected]>
Committed: Tue Dec 10 09:03:59 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/61ebe2db/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 7b9684c..0dd86b0 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();
                                        }
@@ -479,7 +479,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();
                        }

Reply via email to