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/04/10 07:51:54 UTC
wicket git commit: [WICKET-6354] string constants and references are
added for all versions of jquery
Repository: wicket
Updated Branches:
refs/heads/master 5f4affeb6 -> dbfe141da
[WICKET-6354] string constants and references are added for all versions of jquery
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dbfe141d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dbfe141d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dbfe141d
Branch: refs/heads/master
Commit: dbfe141da0f447d86d4174c56454fe61cbe545f4
Parents: 5f4affe
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Apr 10 14:22:02 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Apr 10 14:22:02 2017 +0700
----------------------------------------------------------------------
.../org/apache/wicket/resource/JQueryResourceReference.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dbfe141d/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 57c39d9..6e9034d 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,6 +16,7 @@
*/
package org.apache.wicket.resource;
+import static org.apache.wicket.resource.DynamicJQueryResourceReference.VERSION_2;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
@@ -35,8 +36,11 @@ 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";
+ public static final String VERSION_3 = "jquery/jquery-3.2.1.js";
- private static final JQueryResourceReference INSTANCE = new JQueryResourceReference();
+ 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);
/**
* Normally you should not use this method, but use
@@ -47,7 +51,7 @@ public class JQueryResourceReference extends JavaScriptResourceReference
*/
public static JQueryResourceReference get()
{
- return INSTANCE;
+ return INSTANCE_1;
}
protected JQueryResourceReference()