You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2017/06/14 12:43:24 UTC
wicket git commit: Improve jQuery.noConflict() support.
Repository: wicket
Updated Branches:
refs/heads/master b82e5e88a -> 14df24816
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)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/14df2481
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/14df2481
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/14df2481
Branch: refs/heads/master
Commit: 14df2481619f1eada305832f5726ea657c720b64
Parents: b82e5e8
Author: Jezza <je...@gmail.com>
Authored: Thu Jun 8 10:47:26 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 14 14:43:16 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/14df2481/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 f0289fc..bb76b01 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
@@ -2112,9 +2112,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);
});