Author: mgrigorov
Date: Mon Dec 19 16:13:43 2011
New Revision: 1220824
URL: http://svn.apache.org/viewvc?rev=1220824&view=rev
Log:
WICKET-4273
Rendering of resources in the header with dependency resolving and support for
bundles
Make it easier to setup custom version of JQuery
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java?rev=1220824&r1=1220823&r2=1220824&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java
Mon Dec 19 16:13:43 2011
@@ -18,6 +18,8 @@ package org.apache.wicket.ajax;
import java.util.Collections;
+import org.apache.wicket.Application;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference;
import org.apache.wicket.resource.header.HeaderItem;
import org.apache.wicket.resource.header.JavaScriptHeaderItem;
@@ -47,6 +49,13 @@ public class WicketAjaxJQueryResourceRef
@Override
public Iterable<? extends HeaderItem> getDependencies()
{
- return
Collections.singletonList(JavaScriptHeaderItem.forReference(WicketEventJQueryResourceReference.get()));
+ final ResourceReference wicketEventReference;
+ if (Application.exists()) {
+ wicketEventReference =
Application.get().getJavaScriptLibrarySettings().getWicketEventReference();
+ }
+ else {
+ wicketEventReference =
WicketEventJQueryResourceReference.get();
+ }
+ return
Collections.singletonList(JavaScriptHeaderItem.forReference(wicketEventReference));
}
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java?rev=1220824&r1=1220823&r2=1220824&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
Mon Dec 19 16:13:43 2011
@@ -18,6 +18,8 @@ package org.apache.wicket.ajax;
import java.util.Arrays;
+import org.apache.wicket.Application;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.JQueryResourceReference;
import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference;
import org.apache.wicket.resource.header.HeaderItem;
@@ -49,6 +51,13 @@ public class WicketEventJQueryResourceRe
@Override
public Iterable<? extends HeaderItem> getDependencies()
{
- return
Arrays.asList(JavaScriptHeaderItem.forReference(JQueryResourceReference.get()));
+ final ResourceReference backingLibraryReference;
+ if (Application.exists()) {
+ backingLibraryReference =
Application.get().getJavaScriptLibrarySettings().getBackingLibraryReference();
+ }
+ else {
+ backingLibraryReference = JQueryResourceReference.get();
+ }
+ return
Arrays.asList(JavaScriptHeaderItem.forReference(backingLibraryReference));
}
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java?rev=1220824&r1=1220823&r2=1220824&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java
Mon Dec 19 16:13:43 2011
@@ -34,6 +34,18 @@ import org.apache.wicket.resource.JQuery
*/
public interface IJavaScriptLibrarySettings
{
+
+ /**
+ * @return the reference to the JavaScript library used as backing
library
+ */
+ ResourceReference getBackingLibraryReference();
+
+ /**
+ * @param reference
+ * a reference to the JavaScript library used as backing
library
+ */
+ void setBackingLibraryReference(ResourceReference reference);
+
/**
* @return the reference to the implementation of wicket-event.js
*/
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java?rev=1220824&r1=1220823&r2=1220824&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java
Mon Dec 19 16:13:43 2011
@@ -20,6 +20,7 @@ import org.apache.wicket.ajax.WicketAjax
import org.apache.wicket.ajax.WicketAjaxJQueryResourceReference;
import org.apache.wicket.ajax.WicketEventJQueryResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.resource.JQueryResourceReference;
import org.apache.wicket.settings.IJavaScriptLibrarySettings;
import org.apache.wicket.util.lang.Args;
@@ -28,6 +29,8 @@ import org.apache.wicket.util.lang.Args;
*/
public class JavaScriptLibrarySettings implements IJavaScriptLibrarySettings
{
+ private ResourceReference backingLibraryReference =
JQueryResourceReference.get();
+
private ResourceReference wicketEventReference =
WicketEventJQueryResourceReference.get();
private ResourceReference wicketAjaxReference =
WicketAjaxJQueryResourceReference.get();
@@ -35,6 +38,18 @@ public class JavaScriptLibrarySettings i
private ResourceReference wicketAjaxDebugReference =
WicketAjaxDebugJQueryResourceReference.get();
@Override
+ public ResourceReference getBackingLibraryReference()
+ {
+ return backingLibraryReference;
+ }
+
+ @Override
+ public void setBackingLibraryReference(ResourceReference
backingLibraryReference)
+ {
+ this.backingLibraryReference =
Args.notNull(backingLibraryReference, "backingLibraryReference");
+ }
+
+ @Override
public ResourceReference getWicketEventReference()
{
return wicketEventReference;
