Updated Branches: refs/heads/wicket-cdi-1.1-rewrite 27ad91619 -> 0de87fdce (forced update)
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/4b43ba65 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4b43ba65 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4b43ba65 Branch: refs/heads/wicket-cdi-1.1-rewrite Commit: 4b43ba654841655e31c416a67e2bd50b65def709 Parents: 49840c0 Author: bitstorm <[email protected]> Authored: Thu Nov 14 23:07:21 2013 +0100 Committer: bitstorm <[email protected]> Committed: Thu Nov 14 23:10:27 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/4b43ba65/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 5bb5f32..31176fa 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 @@ -589,7 +589,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/4b43ba65/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 69e3160..1d147c1 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 @@ -1209,7 +1209,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>"+
