git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
wicket
/
components
/
src
/
main
/
java
/
org
/
wamblee
/
wicket
/
jquery
/
JQueryHeaderContributor.java
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryHeaderContributor.java
similarity index 57%
rename from
wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryBehavior.java
rename to
wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryHeaderContributor.java
index 0efab6fabdfde8a926776877acf8b20887e071f1..fb4cdf489d0d5c6c9d54bb242cb253bcf38d1d20 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryHeaderContributor.java
@@
-17,6
+17,8
@@
package org.wamblee.wicket.jquery;
import org.apache.wicket.Application;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.Application;
import org.apache.wicket.behavior.HeaderContributor;
+import org.apache.wicket.markup.html.IHeaderContributor;
+import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.JavascriptPackageResource;
/**
import org.apache.wicket.markup.html.JavascriptPackageResource;
/**
@@
-24,17
+26,21
@@
import org.apache.wicket.markup.html.JavascriptPackageResource;
*
* @author Erik Brakkee
*/
*
* @author Erik Brakkee
*/
-public class JQuery
Behavi
or extends HeaderContributor {
+public class JQuery
HeaderContribut
or extends HeaderContributor {
static final String JQUERY_DEPLOYMENT = "jquery-1.4.2.min.js";
static final String JQUERY_DEVELOPMENT = "jquery-1.4.2.js";
static final String JQUERY_DEPLOYMENT = "jquery-1.4.2.min.js";
static final String JQUERY_DEVELOPMENT = "jquery-1.4.2.js";
+ static final String JQUERY_NOCONFLICT = "jquery-noconflict.js";
- private static HeaderContributor CACHE;
+ private static HeaderContributor JQUERY_CONTRIBUTOR;
+ private static HeaderContributor JQUERY_NOCONFLICT_CONTRIBUTOR =
+ JavascriptPackageResource.getHeaderContribution(
+ JQueryHeaderContributor.class, JQUERY_NOCONFLICT);
/**
* Constructs the behavior.
*/
/**
* Constructs the behavior.
*/
- public JQuery
Behavi
or() {
+ public JQuery
HeaderContribut
or() {
super(getContributor());
}
super(getContributor());
}
@@
-42,15
+48,21
@@
public class JQueryBehavior extends HeaderContributor {
* Resets the cached value of the header contribution. Used typically for test only.
*/
public static void clear() {
* Resets the cached value of the header contribution. Used typically for test only.
*/
public static void clear() {
- CACHE = null;
+ JQUERY_CONTRIBUTOR = null;
}
}
- private static HeaderContributor getContributor() {
- if (
CACHE
== null) {
-
CACHE
= JavascriptPackageResource.getHeaderContribution(
- JQuery
Behavi
or.class, getJQueryJavascript());
+ private static
I
HeaderContributor getContributor() {
+ if (
JQUERY_CONTRIBUTOR
== null) {
+
JQUERY_CONTRIBUTOR
= JavascriptPackageResource.getHeaderContribution(
+ JQuery
HeaderContribut
or.class, getJQueryJavascript());
}
}
- return CACHE;
+ return new IHeaderContributor() {
+ @Override
+ public void renderHead(IHeaderResponse aResponse) {
+ JQUERY_CONTRIBUTOR.renderHead(aResponse);
+ JQUERY_NOCONFLICT_CONTRIBUTOR.renderHead(aResponse);
+ }
+ };
}
private static String getJQueryJavascript() {
}
private static String getJQueryJavascript() {