Updated Branches: refs/heads/master fb2b200f2 -> 3bd454b10
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/3bd454b1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3bd454b1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3bd454b1 Branch: refs/heads/master Commit: 3bd454b10271aeabdb6be7e2559eafce92e4ac1e Parents: fb2b200 Author: Igor Vaynberg <igor.vaynb...@gmail.com> Authored: Thu Dec 27 10:30:46 2012 -0800 Committer: Igor Vaynberg <igor.vaynb...@gmail.com> Committed: Thu Dec 27 10:30:58 2012 -0800 ---------------------------------------------------------------------- .../.settings/org.eclipse.core.resources.prefs | 3 ++- .../extensions/ajax/markup/html/modal/res/modal.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3bd454b1/wicket-experimental/wicket-bootstrap/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-bootstrap/.settings/org.eclipse.core.resources.prefs b/wicket-experimental/wicket-bootstrap/.settings/org.eclipse.core.resources.prefs index eb4e8cf..f5becf8 100644 --- a/wicket-experimental/wicket-bootstrap/.settings/org.eclipse.core.resources.prefs +++ b/wicket-experimental/wicket-bootstrap/.settings/org.eclipse.core.resources.prefs @@ -1,10 +1,11 @@ -#Mon Oct 10 10:40:56 EEST 2011 eclipse.preferences.version=1 encoding//.deprecations/DEPRECATE_wicket.markup.html.form.FormComponent.inputAsStringArray().xml=utf-8 encoding//.deprecations/DEPRECATE_wicket.markup.html.list.ListView.setOptimizeItemRemoval(boolean).xml=utf-8 encoding//.deprecations/DEPRECATE_wicket.markup.html.tree.Tree$TreePathsListView.getOptimizeItemRemoval().xml=utf-8 encoding//src/java/wicket/Application_bg.properties=UTF-8 encoding//src/main/java=UTF-8 +encoding//src/main/java/org/apache/wicket/bootstrap/AbstractModal.html=UTF-8 +encoding//src/main/java/org/apache/wicket/bootstrap/Modal.html=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding/<project>=UTF-8 http://git-wip-us.apache.org/repos/asf/wicket/blob/3bd454b1/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 3f2ba19..b693e63 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(); }
