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 2013/05/31 09:19:25 UTC
[14/14] git commit: WICKET-5208 Contribute jQuery 1.x or 2.x
depending on the user agent
WICKET-5208 Contribute jQuery 1.x or 2.x depending on the user agent
Move the constant for VERSION_1 to JQueryResourceReference, so we don't forget to update it next time.
Simplify DynamicJQueryResourceReference.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/62613f5a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/62613f5a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/62613f5a
Branch: refs/heads/wicket-6.x
Commit: 62613f5afe301c183b5a6c7c2ee76325d7d1097d
Parents: 87ca45a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri May 31 10:17:08 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri May 31 10:18:54 2013 +0300
----------------------------------------------------------------------
.../resource/DynamicJQueryResourceReference.java | 29 ++-------------
.../wicket/resource/JQueryResourceReference.java | 9 ++++-
2 files changed, 11 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/62613f5a/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 b191536..96f96c6 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
@@ -22,8 +22,6 @@ import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.wicket.settings.IJavaScriptLibrarySettings;
/**
@@ -35,9 +33,9 @@ import org.apache.wicket.settings.IJavaScriptLibrarySettings;
* app.getJavaScriptLibrarySettings().setJQueryReference(DynamicJQueryResourceReference.INSTANCE)
* </code>
*
- * @since 7.0.0
+ * @since 6.9.0
*/
-public class DynamicJQueryResourceReference extends JavaScriptResourceReference
+public class DynamicJQueryResourceReference extends JQueryResourceReference
{
private static final long serialVersionUID = 1L;
@@ -50,31 +48,12 @@ public class DynamicJQueryResourceReference extends JavaScriptResourceReference
};
/**
- * jQuery ver. 1.x - works on modern browsers and IE 6/7/8
- */
- private static final String VERSION_1 = "jquery/jquery-1.10.1.js";
-
- /**
* jQuery ver. 2.x - works only on modern browsers
*/
- private static final String VERSION_2 = "jquery/jquery-2.0.2.js";
-
- private static final DynamicJQueryResourceReference INSTANCE = new DynamicJQueryResourceReference();
-
- /**
- * Normally you should not use this method, but use
- * {@link IJavaScriptLibrarySettings#getJQueryReference()} to prevent version conflicts.
- *
- * @return the single instance of the resource reference
- */
- public static DynamicJQueryResourceReference get()
- {
- return INSTANCE;
- }
+ public static final String VERSION_2 = "jquery/jquery-2.0.2.js";
- protected DynamicJQueryResourceReference()
+ public DynamicJQueryResourceReference()
{
- super(DynamicJQueryResourceReference.class, VERSION_1);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/62613f5a/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 c9bbcf8..aa5a1a5 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
@@ -31,6 +31,11 @@ public class JQueryResourceReference extends JavaScriptResourceReference
{
private static final long serialVersionUID = 1L;
+ /**
+ * jQuery ver. 1.x - works on modern browsers and IE 6/7/8
+ */
+ public static final String VERSION_1 = "jquery/jquery-1.10.1.js";
+
private static final JQueryResourceReference INSTANCE = new JQueryResourceReference();
/**
@@ -44,8 +49,8 @@ public class JQueryResourceReference extends JavaScriptResourceReference
return INSTANCE;
}
- private JQueryResourceReference()
+ protected JQueryResourceReference()
{
- super(JQueryResourceReference.class, "jquery/jquery-1.10.0.js");
+ super(JQueryResourceReference.class, VERSION_1);
}
}