Repository: wicket Updated Branches: refs/heads/wicket-6.x f3c246161 -> 75a4fdcba
Improve jQuery.noConflict() support. The fix that was introduced with the fix for WICKET-6204 fails to work with jQuery.noConflict(). (cherry picked from commit 98b1073090ab16df64eaa9ddffeba7489818a8be) (cherry picked from commit 451ae250f4c9dce8900eb1b1854e22fca9d0570c) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/75a4fdcb Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/75a4fdcb Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/75a4fdcb Branch: refs/heads/wicket-6.x Commit: 75a4fdcbab199da9a499059ae5445c989596de7d Parents: f3c2461 Author: Jezza <[email protected]> Authored: Thu Jun 8 10:47:26 2017 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Jun 14 14:45:05 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/75a4fdcb/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js index 2f6bf59..64852de 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js @@ -2147,9 +2147,9 @@ var css = Wicket.Head.createElement("link"); // copy supplied attributes only. - var attributes = $(node).prop("attributes"); - var $css = $(css); - $.each(attributes, function() { + var attributes = jQuery(node).prop("attributes"); + var $css = jQuery(css); + jQuery.each(attributes, function() { $css.attr(this.name, this.value); });
