You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2013/11/14 23:08:13 UTC
git commit: WICKET-5413 Positioning AutoCompleteTextField not correct
on resized window WICKET-5379 IE7: AutoCompleteTextField inside a ModalWindow
shows auto complete dropdown behind ModalWindow
Updated Branches:
refs/heads/master 5dc54dcfd -> 2bbbf3e20
WICKET-5413 Positioning AutoCompleteTextField not correct on resized
window
WICKET-5379 IE7: AutoCompleteTextField inside a ModalWindow shows auto
complete dropdown behind ModalWindow
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2bbbf3e2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2bbbf3e2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2bbbf3e2
Branch: refs/heads/master
Commit: 2bbbf3e20685efcc6858ceb78e4b39eacec99c75
Parents: 5dc54dc
Author: bitstorm <an...@gmail.com>
Authored: Thu Nov 14 23:07:21 2013 +0100
Committer: bitstorm <an...@gmail.com>
Committed: Thu Nov 14 23:07:21 2013 +0100
----------------------------------------------------------------------
.../ajax/markup/html/autocomplete/wicket-autocomplete.js | 2 +-
.../apache/wicket/extensions/ajax/markup/html/modal/res/modal.js | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bbbf3e2/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
index ae1ec15..6c500ca 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
@@ -576,7 +576,7 @@
}
function getPosition(obj) {
- var rectangle = obj.getBoundingClientRect();
+ var rectangle = $(obj).offset();
var leftPosition = rectangle.left || 0;
var topPosition = rectangle.top || 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bbbf3e2/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 b2b3878..7b9684c 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
@@ -1203,7 +1203,8 @@
}
s+= " frameborder=\"0\" id=\""+idContent+"\" allowtransparency=\"false\" style=\"height: 200px\" class=\"wicket_modal\"></iframe>";
} else {
- s+= "<div id='"+idContent+"' class='w_content_container'></div>";
+ var styleIE7 = Wicket.Browser.isIE7() ? "style='z-index: 20001'" : "";
+ s+= "<div id='"+idContent+"' class='w_content_container' " + styleIE7 + "></div>";
}
s+=
"</div>"+