WICKET-5917 Do not use jQuery's $ in String snippets in Java code (cherry picked from commit b7620f499adb8098903aa2c806c54e0b0a85e4c5)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b48042da Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b48042da Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b48042da Branch: refs/heads/master Commit: b48042da7ad6e9ba7fb37526715990a0d9a0368b Parents: 9cf3cb8 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Jun 3 17:54:43 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Jun 3 17:55:21 2015 +0300 ---------------------------------------------------------------------- .../org/apache/wicket/examples/resourcedecoration/HomePage.java | 2 +- .../main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java | 2 +- .../java/org/apache/wicket/atmosphere/jquery.wicketatmosphere.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b48042da/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java index f8b19ba..2959223 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java @@ -62,7 +62,7 @@ public class HomePage extends WicketExamplePage @Override public void renderHead(Component component, IHeaderResponse response) { - response.render(OnDomReadyHeaderItem.forScript("$('#" + + response.render(OnDomReadyHeaderItem.forScript("jQuery('#" + jsPlaceholder.getMarkupId() + "').html('the ondomready script ran').css('border-color', 'green');")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/b48042da/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java index 36c9fe6..1152303 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java @@ -225,7 +225,7 @@ public class AtmosphereBehavior extends AbstractAjaxBehavior response.render(JavaScriptHeaderItem.forReference(JQueryWicketAtmosphereResourceReference.get())); JSONObject options = findEventBus().getParameters().toJSON(); options.put("url", getCallbackUrl()); - response.render(OnDomReadyHeaderItem.forScript("$('#" + component.getMarkupId() + + response.render(OnDomReadyHeaderItem.forScript("jQuery('#" + component.getMarkupId() + "').wicketAtmosphere(" + options.toString() + ")")); } catch (JSONException e) http://git-wip-us.apache.org/repos/asf/wicket/blob/b48042da/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/jquery.wicketatmosphere.js ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/jquery.wicketatmosphere.js b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/jquery.wicketatmosphere.js index 2bad9ab..e5b2db3 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/jquery.wicketatmosphere.js +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/jquery.wicketatmosphere.js @@ -18,7 +18,7 @@ ;(function($) { 'use strict'; - jQuery.fn.wicketAtmosphere = function(params) { + $.fn.wicketAtmosphere = function(params) { var callbackAdded = false; // jquery.atmosphere.response
