Repository: wicket Updated Branches: refs/heads/wicket-6.x b205b2d3d -> bfa70675d
Change "$" to jQuery in wicket-autocomplete.js This helps to avoid conflicts, and to support the "no conflict mode" of jQuery (cherry picked from commit 17e7279a7ca50fe529d810b3418f5d55e28a1ebf) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bfa70675 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bfa70675 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bfa70675 Branch: refs/heads/wicket-6.x Commit: bfa70675d01a87b87dd785020ecd7e54b27894a2 Parents: b205b2d Author: bsaad <[email protected]> Authored: Sat Mar 1 18:11:38 2014 +0000 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 4 11:48:32 2014 +0200 ---------------------------------------------------------------------- .../ajax/markup/html/autocomplete/wicket-autocomplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/bfa70675/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 31176fa..e65ae26 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).offset(); + var rectangle = jQuery(obj).offset(); var leftPosition = rectangle.left || 0; var topPosition = rectangle.top || 0;
