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/30 09:19:27 UTC
git commit: WICKET-5208 Contribute jQuery 1.x or 2.x depending on the
user agent
Updated Branches:
refs/heads/wicket-6.x e25945e13 -> 2f4f02e2e
WICKET-5208 Contribute jQuery 1.x or 2.x depending on the user agent
Make it easier to extend DynamicJQueryResourceReference to be able to change the used versions of jQuery and reuse #getName() where is the logic to calculate the version.
Example:
public class CustomJQuery extends DynamicJQueryResourceReference
{
@Override
protected String getVersion1()
{
return "jquery/jquery-1.10.0.min.js";
}
@Override
protected String getVersion2()
{
return "jquery/jquery-1.10.0.min.js";
}
}
getJavaScriptLibrarySettings().setJQueryReference(new CustomJQuery());
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2f4f02e2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2f4f02e2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2f4f02e2
Branch: refs/heads/wicket-6.x
Commit: 2f4f02e2e097de04b7aa3127932f66fbad08afe6
Parents: e25945e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu May 30 10:17:01 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu May 30 10:17:01 2013 +0300
----------------------------------------------------------------------
.../resource/DynamicJQueryResourceReference.java | 22 +++++++++++++--
1 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2f4f02e2/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 674cbc5..d668195 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
@@ -72,7 +72,7 @@ public class DynamicJQueryResourceReference extends JavaScriptResourceReference
return INSTANCE;
}
- private DynamicJQueryResourceReference()
+ protected DynamicJQueryResourceReference()
{
super(DynamicJQueryResourceReference.class, VERSION_1);
}
@@ -85,7 +85,7 @@ public class DynamicJQueryResourceReference extends JavaScriptResourceReference
if (name == null)
{
WebClientInfo clientInfo;
- name = VERSION_2;
+ name = getVersion2();
if (Session.exists())
{
WebSession session = WebSession.get();
@@ -98,11 +98,27 @@ public class DynamicJQueryResourceReference extends JavaScriptResourceReference
ClientProperties clientProperties = clientInfo.getProperties();
if (clientProperties.isBrowserInternetExplorer() && clientProperties.getBrowserVersionMajor() < 9)
{
- name = VERSION_1;
+ name = getVersion1();
}
requestCycle.setMetaData(KEY, name);
}
return name;
}
+
+ protected String getVersion1()
+ {
+ return VERSION_1;
+ }
+
+ protected String getVersion2()
+ {
+ return VERSION_2;
+ }
+
+ @Override
+ public Class<?> getScope()
+ {
+ return getClass();
+ }
}