X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=wicket%2Fcomponents%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fwicket%2Fjquery%2FJQueryHeaderContributor.java;h=216b08248976debef4692d58dba5090b1f1b50a2;hb=6c5dc665abfe021a7add911d1ca167113f4ccae8;hp=fb4cdf489d0d5c6c9d54bb242cb253bcf38d1d20;hpb=394f519a82338bb854c8731afdd6825abc7e6931;p=utils diff --git a/wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryHeaderContributor.java b/wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryHeaderContributor.java index fb4cdf48..216b0824 100644 --- a/wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryHeaderContributor.java +++ b/wicket/components/src/main/java/org/wamblee/wicket/jquery/JQueryHeaderContributor.java @@ -22,14 +22,17 @@ import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.JavascriptPackageResource; /** - * JQuery bahavior which adds the jquery javascript. + * JQuery header contribution that adds the jquery javascript and sets jQuery to + * no-conflict mode so the $ identifier is freed. Also, it checks + * the current configuration and uses the development mode jQuery library when run in + * development mode and used the minimalized jQuery code when running in deployment mode. * * @author Erik Brakkee */ public class JQueryHeaderContributor 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.5.min.js"; + static final String JQUERY_DEVELOPMENT = "jquery-1.5.js"; static final String JQUERY_NOCONFLICT = "jquery-noconflict.js"; private static HeaderContributor JQUERY_CONTRIBUTOR;