Repository: wicket Updated Branches: refs/heads/master dbfe141da -> d0974d428
WICKET-6354 Add static getters for all supported jQuery versions Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d0974d42 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d0974d42 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d0974d42 Branch: refs/heads/master Commit: d0974d428f5d3679ebd4dbcfc8507e6b826374bb Parents: dbfe141 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Apr 10 17:37:48 2017 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Apr 10 17:37:48 2017 +0200 ---------------------------------------------------------------------- .../DynamicJQueryResourceReference.java | 5 --- .../resource/JQueryResourceReference.java | 43 ++++++++++++++++++-- 2 files changed, 39 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d0974d42/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java index 0fcacc3..de5582f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java @@ -47,11 +47,6 @@ public class DynamicJQueryResourceReference extends JQueryResourceReference { }; - /** - * jQuery ver. 2.x - works only on modern browsers - */ - public static final String VERSION_2 = "jquery/jquery-2.2.4.js"; - public DynamicJQueryResourceReference() { } http://git-wip-us.apache.org/repos/asf/wicket/blob/d0974d42/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java index 6e9034d..712c99a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java @@ -16,7 +16,6 @@ */ package org.apache.wicket.resource; -import static org.apache.wicket.resource.DynamicJQueryResourceReference.VERSION_2; import org.apache.wicket.request.resource.JavaScriptResourceReference; @@ -36,11 +35,21 @@ public class JQueryResourceReference extends JavaScriptResourceReference * jQuery ver. 1.x - works on modern browsers and IE 6/7/8 */ public static final String VERSION_1 = "jquery/jquery-1.12.4.js"; + + /** + * jQuery ver. 2.x - works only on modern browsers + */ + public static final String VERSION_2 = "jquery/jquery-2.2.4.js"; + + /** + * JQuery ver. 3.x - improves on ver. 2 + * <strong>Note</strong>: Might not work with old jQuery plugins! + */ public static final String VERSION_3 = "jquery/jquery-3.2.1.js"; - public static final JQueryResourceReference INSTANCE_1 = new JQueryResourceReference(); - public static final JavaScriptResourceReference INSTANCE_2 = new JavaScriptResourceReference(JQueryResourceReference.class, VERSION_2); - public static final JavaScriptResourceReference INSTANCE_3 = new JavaScriptResourceReference(JQueryResourceReference.class, VERSION_3); + public static final JQueryResourceReference INSTANCE_1 = new JQueryResourceReference(VERSION_1); + public static final JQueryResourceReference INSTANCE_2 = new JQueryResourceReference(VERSION_2); + public static final JQueryResourceReference INSTANCE_3 = new JQueryResourceReference(VERSION_3); /** * Normally you should not use this method, but use @@ -48,14 +57,40 @@ public class JQueryResourceReference extends JavaScriptResourceReference * to prevent version conflicts. * * @return the single instance of the resource reference + * @deprecated Use either {@link #getV1()}, {@link #getV2()} or {@link #getV3()} instead */ + @Deprecated public static JQueryResourceReference get() { + return getV1(); + } + + public static JQueryResourceReference getV1() + { return INSTANCE_1; } + public static JQueryResourceReference getV2() + { + return INSTANCE_2; + } + + public static JQueryResourceReference getV3() + { + return INSTANCE_3; + } + + /** + * @deprecated Use {@link #JQueryResourceReference(String)} instead + */ + @Deprecated protected JQueryResourceReference() { super(JQueryResourceReference.class, VERSION_1); } + + protected JQueryResourceReference(final String version) + { + super(JQueryResourceReference.class, version); + } }
