Repository: wicket Updated Branches: refs/heads/master 4869f24da -> 17e7279a7
Change "$" to jQuery in wicket-autocomplete.js This helps to avoid conflicts, and to support the "no conflict mode" of jQuery Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/17e7279a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/17e7279a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/17e7279a Branch: refs/heads/master Commit: 17e7279a7ca50fe529d810b3418f5d55e28a1ebf Parents: 4869f24 Author: bsaad <[email protected]> Authored: Sat Mar 1 18:11:38 2014 +0000 Committer: bsaad <[email protected]> Committed: Sat Mar 1 18:11:38 2014 +0000 ---------------------------------------------------------------------- .../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/17e7279a/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 6c500ca..95229a3 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).offset(); + var rectangle = jQuery(obj).offset(); var leftPosition = rectangle.left || 0; var topPosition = rectangle.top || 0;
