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 2011/11/17 14:44:35 UTC
svn commit: r1203187 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/
wicket-core/src/main/java/org/apache/wicket/ajax/
wicket-core/src/main/java/org/apache/wicket/markup/html/
wicket-core/src/main/java/org/apache/wicket/markup/html/for...
Author: mgrigorov
Date: Thu Nov 17 13:44:34 2011
New Revision: 1203187
URL: http://svn.apache.org/viewvc?rev=1203187&view=rev
Log:
WICKET-4236 Use JQuery as a backing library for Wicket's JavaScript code
Make it possible to override the backing library (jquery) and our implementations.
This way is anyone ever wants to use YUI/ExtJS/Dojo/... instead of JQuery it will be possible.
This way also the developer can setup a different version of JQuery.
Added:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IAjaxSettings.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/AjaxSettings.java
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventReference.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketJQueryReference.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/wicket-event.js
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Application.java Thu Nov 17 13:44:34 2011
@@ -80,6 +80,7 @@ import org.apache.wicket.response.filter
import org.apache.wicket.session.DefaultPageFactory;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.session.ISessionStore.UnboundListener;
+import org.apache.wicket.settings.IAjaxSettings;
import org.apache.wicket.settings.IApplicationSettings;
import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.settings.IExceptionSettings;
@@ -92,6 +93,7 @@ import org.apache.wicket.settings.IResou
import org.apache.wicket.settings.ISecuritySettings;
import org.apache.wicket.settings.ISessionSettings;
import org.apache.wicket.settings.IStoreSettings;
+import org.apache.wicket.settings.def.AjaxSettings;
import org.apache.wicket.settings.def.ApplicationSettings;
import org.apache.wicket.settings.def.DebugSettings;
import org.apache.wicket.settings.def.ExceptionSettings;
@@ -1006,6 +1008,9 @@ public abstract class Application implem
/** Application settings */
private IApplicationSettings applicationSettings;
+ /** Ajax settings */
+ private IAjaxSettings ajaxSettings;
+
/** Debug Settings */
private IDebugSettings debugSettings;
@@ -1066,6 +1071,29 @@ public abstract class Application implem
}
/**
+ * @return Application's Ajax settings
+ * @since 6.0
+ */
+ public final IAjaxSettings getAjaxSettings()
+ {
+ checkSettingsAvailable();
+ if (ajaxSettings == null)
+ {
+ ajaxSettings = new AjaxSettings();
+ }
+ return ajaxSettings;
+ }
+
+ /**
+ *
+ * @param ajaxSettings
+ */
+ public final void setAjaxSettings(final IAjaxSettings ajaxSettings)
+ {
+ this.ajaxSettings = ajaxSettings;
+ }
+
+ /**
* @return Application's debug related settings
*/
public final IDebugSettings getDebugSettings()
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Thu Nov 17 13:44:34 2011
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.ajax;
-import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
@@ -25,10 +24,8 @@ import org.apache.wicket.markup.html.IHe
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
@@ -50,10 +47,6 @@ public abstract class AbstractDefaultAja
public static final ResourceReference INDICATOR = new PackageResourceReference(
AbstractDefaultAjaxBehavior.class, "indicator.gif");
- /** reference to the default ajax debug support javascript file. */
- private static final ResourceReference JAVASCRIPT_DEBUG = new JavaScriptResourceReference(
- AbstractDefaultAjaxBehavior.class, "res/js/wicket-ajax-jquery-debug.js");
-
/**
* Subclasses should call super.onBind()
*
@@ -73,17 +66,7 @@ public abstract class AbstractDefaultAja
{
super.renderHead(component, response);
- response.renderJavaScriptReference(WicketJQueryReference.INSTANCE);
- response.renderJavaScriptReference(WicketEventReference.INSTANCE);
- response.renderJavaScriptReference(WicketAjaxReference.INSTANCE);
-
- final IDebugSettings debugSettings = Application.get().getDebugSettings();
- if (debugSettings.isAjaxDebugModeEnabled())
- {
- response.renderJavaScriptReference(JAVASCRIPT_DEBUG);
- response.renderJavaScript("Wicket.Ajax.DebugWindow.enabled=true;",
- "wicket-ajax-debug-enable");
- }
+ AjaxLibrariesContributor.contribute(component.getApplication(), response);
Url baseUrl = RequestCycle.get().getUrlRenderer().getBaseUrl();
CharSequence ajaxBaseUrl = Strings.escapeMarkup(baseUrl.toString());
Added: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java?rev=1203187&view=auto
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java (added)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java Thu Nov 17 13:44:34 2011
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.ajax;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.settings.IAjaxSettings;
+import org.apache.wicket.settings.IDebugSettings;
+
+/**
+ * A helper class that contributes all required JavaScript resources needed for Wicket Ajax
+ * functionality
+ *
+ * @since 6.0
+ */
+public class AjaxLibrariesContributor
+{
+
+ /**
+ * Contributes the Ajax backing library plus wicket-event.js and wicket-ajax.js implementations.
+ * Additionally if Ajax debug is enabled then wicket-ajax-debug.js implementation is also added.
+ *
+ * @param application
+ * the application instance
+ * @param response
+ * the current header response
+ */
+ public static void contribute(final Application application, final IHeaderResponse response)
+ {
+ IAjaxSettings ajaxSettings = application.getAjaxSettings();
+ ResourceReference backingLibraryReference = ajaxSettings.getBackingLibraryReference();
+
+ ResourceReference wicketEventReference = ajaxSettings.getWicketEventReference();
+ ResourceReference wicketAjaxReference = ajaxSettings.getWicketAjaxReference();
+
+ response.renderJavaScriptReference(backingLibraryReference);
+ response.renderJavaScriptReference(wicketEventReference);
+ response.renderJavaScriptReference(wicketAjaxReference);
+
+
+ final IDebugSettings debugSettings = application.getDebugSettings();
+ if (debugSettings.isAjaxDebugModeEnabled())
+ {
+ response.renderJavaScriptReference(ajaxSettings.getWicketAjaxDebugReference());
+ response.renderJavaScript("Wicket.Ajax.DebugWindow.enabled=true;",
+ "wicket-ajax-debug-enable");
+ }
+ }
+}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java Thu Nov 17 13:44:34 2011
@@ -16,9 +16,7 @@
*/
package org.apache.wicket.markup.html.form;
-import org.apache.wicket.ajax.WicketAjaxReference;
-import org.apache.wicket.ajax.WicketEventReference;
-import org.apache.wicket.ajax.WicketJQueryReference;
+import org.apache.wicket.ajax.AjaxLibrariesContributor;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -71,9 +69,7 @@ public abstract class AbstractCheckSelec
public void renderHead(IHeaderResponse response)
{
// make sure we have all the javascript we need
- response.renderJavaScriptReference(WicketJQueryReference.INSTANCE);
- response.renderJavaScriptReference(WicketEventReference.INSTANCE);
- response.renderJavaScriptReference(WicketAjaxReference.INSTANCE);
+ AjaxLibrariesContributor.contribute(getApplication(), response);
response.renderJavaScriptReference(JS);
String findCheckboxes = getFindCheckboxesFunction().toString();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java Thu Nov 17 13:44:34 2011
@@ -21,8 +21,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.wicket.Application;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.WicketEventReference;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -368,7 +368,9 @@ public abstract class HeaderResponse imp
List<String> token = Arrays.asList("javascript-event", target, event, javascript);
if (wasRendered(token) == false)
{
- renderJavaScriptReference(WicketEventReference.INSTANCE);
+ renderJavaScriptReference(Application.get()
+ .getAjaxSettings()
+ .getWicketEventReference());
JavaScriptUtils.writeJavaScript(getResponse(), "Wicket.Event.add(" + target +
", \"" + event + "\", function(event) { " + javascript + ";});");
markRendered(token);
Added: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IAjaxSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IAjaxSettings.java?rev=1203187&view=auto
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IAjaxSettings.java (added)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/IAjaxSettings.java Thu Nov 17 13:44:34 2011
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.settings;
+
+import org.apache.wicket.request.resource.ResourceReference;
+
+
+/**
+ * Interface for Ajax related settings.
+ * <p>
+ * With these settings the user application can replace the JavaScript libraries used for Wicket
+ * Ajax functionality. By default Wicket uses JQuery as a backing library but with
+ * {@link #setBackingLibraryReference(ResourceReference)} the application can either replace with
+ * Dojo, YUI, ... or just use a different version of JQuery. If the backing library is replaced with
+ * another one then the user application will need to provide implementation of Wicket JavaScript
+ * APIs implemented with the new backing library, i.e. will need to set different resource
+ * references for wicket-event.js and wicket-ajax.js
+ *
+ * @since 6.0
+ */
+public interface IAjaxSettings
+{
+ /**
+ * @return the reference to the used backing library
+ */
+ ResourceReference getBackingLibraryReference();
+
+ /**
+ * @param reference
+ * a reference to the backing library
+ */
+ void setBackingLibraryReference(ResourceReference reference);
+
+ /**
+ * @return the reference to the implementation of wicket-event.js
+ */
+ ResourceReference getWicketEventReference();
+
+ /**
+ * @param reference
+ * a reference to the implementation of wicket-event.js
+ */
+ void setWicketEventReference(ResourceReference reference);
+
+ /**
+ * @return the reference to the implementation of wicket-ajax.js
+ */
+ ResourceReference getWicketAjaxReference();
+
+ /**
+ * @param reference
+ * a reference to the implementation of wicket-ajax.js
+ */
+ void setWicketAjaxReference(ResourceReference reference);
+
+ /**
+ * The Wicket Ajax Debug Window.
+ *
+ * @return the reference to the implementation of wicket-ajax-debug.js
+ */
+ ResourceReference getWicketAjaxDebugReference();
+
+ /**
+ * @param reference
+ * a reference to the implementation of wicket-ajax-debug.js
+ */
+ void setWicketAjaxDebugReference(ResourceReference reference);
+}
Added: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/AjaxSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/AjaxSettings.java?rev=1203187&view=auto
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/AjaxSettings.java (added)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/settings/def/AjaxSettings.java Thu Nov 17 13:44:34 2011
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.settings.def;
+
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.settings.IAjaxSettings;
+
+/**
+ * @since 6.0
+ */
+public class AjaxSettings implements IAjaxSettings
+{
+ private ResourceReference backingLibraryReference = new JavaScriptResourceReference(
+ AbstractDefaultAjaxBehavior.class, "res/js/jquery/jquery.min.js");
+
+ private ResourceReference wicketEventReference = new JavaScriptResourceReference(
+ AbstractDefaultAjaxBehavior.class, "res/js/wicket-event-jquery.js");
+
+ private ResourceReference wicketAjaxReference = new JavaScriptResourceReference(
+ AbstractDefaultAjaxBehavior.class, "res/js/wicket-ajax-jquery.js");
+
+ private ResourceReference wicketAjaxDebugReference = new JavaScriptResourceReference(
+ AbstractDefaultAjaxBehavior.class, "res/js/wicket-ajax-jquery-debug.js");
+
+ @Override
+ public ResourceReference getBackingLibraryReference()
+ {
+ return backingLibraryReference;
+ }
+
+ @Override
+ public void setBackingLibraryReference(ResourceReference backingLibraryReference)
+ {
+ this.backingLibraryReference = backingLibraryReference;
+ }
+
+ @Override
+ public ResourceReference getWicketEventReference()
+ {
+ return wicketEventReference;
+ }
+
+ @Override
+ public void setWicketEventReference(ResourceReference wicketEventReference)
+ {
+ this.wicketEventReference = wicketEventReference;
+ }
+
+ @Override
+ public ResourceReference getWicketAjaxReference()
+ {
+ return wicketAjaxReference;
+ }
+
+ @Override
+ public void setWicketAjaxReference(ResourceReference wicketAjaxReference)
+ {
+ this.wicketAjaxReference = wicketAjaxReference;
+ }
+
+ @Override
+ public ResourceReference getWicketAjaxDebugReference()
+ {
+ return wicketAjaxDebugReference;
+ }
+
+ @Override
+ public void setWicketAjaxDebugReference(ResourceReference wicketAjaxDebugReference)
+ {
+ this.wicketAjaxDebugReference = wicketAjaxDebugReference;
+ }
+
+}
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html Thu Nov 17 13:44:34 2011
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html Thu Nov 17 13:44:34 2011
@@ -2,7 +2,7 @@
<head>
<link href="../../test"/>
<script type="text/javascript" src="../../javascripturl"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) { domReady();;});
@@ -26,10 +26,9 @@ Wicket.Event.add(window, "domready", fun
Wicket.Event.add(window, "load", function(event) { onLoadB();;});
/*]]>*/
</script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html Thu Nov 17 13:44:34 2011
@@ -2,7 +2,7 @@
<head>
<link href="../../test"/>
<script type="text/javascript" src="../../javascripturl"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) { domReady();;});
@@ -13,10 +13,9 @@ Wicket.Event.add(window, "domready", fun
Wicket.Event.add(window, "load", function(event) { onLoad();;});
/*]]>*/
</script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html Thu Nov 17 13:44:34 2011
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
@@ -13,7 +13,6 @@ Wicket.Ajax.DebugWindow.enabled=true;
Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPage?0";
/*]]>*/
</script>
-<script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) { test1();;});
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html>
- <head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+ <head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html>
- <head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+ <head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
@@ -13,7 +13,6 @@ Wicket.Ajax.DebugWindow.enabled=true;
Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0";
/*]]>*/
</script>
-<script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) { new Wicket.ChangeHandler('field1');;});
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html Thu Nov 17 13:44:34 2011
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html Thu Nov 17 13:44:34 2011
@@ -1,10 +1,10 @@
<html>
<head>
<title>ajax-test</title>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
@@ -15,7 +15,6 @@ Wicket.Ajax.DebugWindow.enabled=true;
Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0";
/*]]>*/
</script>
-<script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "load", function(event) { setTimeout("var wcall=Wicket.Ajax.get('../page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1',function() { }.bind(this),function() { }.bind(this), function() {var c = Wicket.$('linja11'); return typeof(c) != 'undefined' && c != null}.bind(this));", 2000);;});
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html Thu Nov 17 13:44:34 2011
@@ -2,10 +2,10 @@
<! DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html wicket:id="html" xmlns:wicket="" xmlns="http://www.w3.org/1999/xhtml" xmlns:lang="[current language]" lang="de" id="html1" onclick="var wcall=Wicket.Ajax.get('../page?0-1.IBehaviorListener.1-html',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('html1') != null;}.bind(this));return !wcall;">
- <head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+ <head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html Thu Nov 17 13:44:34 2011
@@ -1,8 +1,8 @@
<html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketJQueryReference/res/js/jquery/jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketEventReference/res/js/wicket-event-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-jquery-debug.js"></script>
+<head><script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable">
/*<![CDATA[*/
Wicket.Ajax.DebugWindow.enabled=true;
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Thu Nov 17 13:44:34 2011
@@ -34,7 +34,6 @@ import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.WicketAjaxReference;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
@@ -979,7 +978,9 @@ public class WicketTesterTest extends Wi
@Test
public void startResourceReference()
{
- tester.startResourceReference(WicketAjaxReference.INSTANCE);
+ tester.startResourceReference(tester.getApplication()
+ .getAjaxSettings()
+ .getWicketAjaxReference());
// verify that a random string from that resource is in the response
tester.assertContains("getAjaxBaseUrl");
}
@@ -990,7 +991,10 @@ public class WicketTesterTest extends Wi
@Test
public void startResource()
{
- tester.startResource(WicketAjaxReference.INSTANCE.getResource());
+ tester.startResource(tester.getApplication()
+ .getAjaxSettings()
+ .getWicketAjaxReference()
+ .getResource());
// verify that a random string from that resource is in the response
tester.assertContains("getAjaxBaseUrl");
}
Modified: wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html (original)
+++ wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html Thu Nov 17 13:44:34 2011
@@ -1,139 +1,139 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Wicket Examples - dates</title>
-<link rel="stylesheet" type="text/css" href="../../style.css"/>
-<style type="text/css">
-/*<![CDATA[*/
-
-th {
- color: grey;
-}
-
-/*]]>*/
-</style>
-<script type="text/javascript" src="../resource/org.apache.wicket.extensions.yui.YuiLib/yuiloader/yuiloader.js"></script>
-<script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
-<script type="text/javascript" >
-/*<![CDATA[*/
-Wicket.Event.add(window, "domready", function(event) { /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-wicketCalendarInits = [];
-wicketCalendarInitFinished = false;
-wicketCalendarI18n = {};
-wicketCalendarAdd = function(initFn) {
- if (wicketCalendarInitFinished) {
- // when a DatePicker is added via ajax, the loader is already finished, so
- // we call the init function directly.
- initFn();
- } else {
- // when page is rendered, all calendar components will be initialized after
- // the required js libraries have been loaded.
- wicketCalendarInits.push(initFn);
- }
-};
-
-var wicketYuiLoader = new YAHOO.util.YUILoader({
- base: "../resource/org.apache.wicket.extensions.yui.YuiLib/",
- filter: "RAW",
- allowRollup: false,
- require: ["wicket-date"],
- onSuccess: function() {
- wicketCalendarInitFinished = true;
- while (wicketCalendarInits.length > 0) {
- wicketCalendarInits.pop()();
- }
- }
-});
-wicketYuiLoader.addModule({
- name: "wicket-date",
- type: "js",
- requires: ["calendar"],
- fullpath: "../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/wicket-date.js"
-});
-wicketYuiLoader.insert();
-;});
-/*]]>*/
-</script>
-<script type="text/javascript" >
-/*<![CDATA[*/
-Wicket.Event.add(window, "domready", function(event) { wicketCalendarI18n["de"]={MONTHS_SHORT:["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],MONTHS_LONG:["Januar","Februar","M\u00E4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],WEEKDAYS_MEDIUM:["So","Mo","Di","Mi","Do","Fr","Sa"],WEEKDAYS_LONG:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],START_WEEKDAY:1,WEEKDAYS_1CHAR:["S","M","D","M","D","F","S"],WEEKDAYS_SHORT:["So","Mo","Di","Mi","Do","Fr","Sa"]};;});
-/*]]>*/
-</script>
-<script type="text/javascript" >
-/*<![CDATA[*/
-Wicket.Event.add(window, "domready", function(event) { /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-wicketCalendarAdd(function() {
- Wicket.DateTime.init2("dateTextField1", "dateTextField1", {close:true,selected:"xx.xx.xxxx",pagedate:"xx.xxxx"}, "dd.MM.yy",
- true, true, true, false, wicketCalendarI18n["de"], false);
-
-});
-;});
-/*]]>*/
-</script>
-</head>
-<body>
-<form wicket:id="localeForm" id="localeForm2" method="post" action="../page?0-1.IFormSubmitListener-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div>
-<p><select wicket:id="localeSelect" onchange="document.getElementById('localeForm2_hf_0').value='page?0-1.IOnChangeListener-localeForm-localeSelect';document.getElementById('localeForm2').submit();" name="localeSelect">
-<option value="0">Chinesisch (China) (Chinese (China))</option>
-<option value="1">Chinesisch (China) (Chinese (China))</option>
-<option value="2">Chinesisch (China) (Chinese (China))</option>
-<option value="3">Chinesisch (Taiwan) (Chinese (Taiwan))</option>
-<option value="4">Chinesisch (Taiwan) (Chinese (Taiwan))</option>
-<option selected="selected" value="5">Deutsch (German)</option>
-<option value="6">Deutsch (Deutschland) (German (Germany))</option>
-<option value="7">Englisch (English)</option>
-<option value="8">Englisch (Kanada) (English (Canada))</option>
-<option value="9">Englisch (Vereinigte Staaten von Amerika) (English (United States))</option>
-<option value="10">Englisch (Vereinigtes Königreich) (English (United Kingdom))</option>
-<option value="11">Französisch (French)</option>
-<option value="12">Französisch (Frankreich) (French (France))</option>
-<option value="13">Französisch (Kanada) (French (Canada))</option>
-<option value="14">Italienisch (Italian)</option>
-<option value="15">Italienisch (Italien) (Italian (Italy))</option>
-<option value="16">Japanisch (Japanese)</option>
-<option value="17">Japanisch (Japan) (Japanese (Japan))</option>
-<option value="18">Koreanisch (Korean)</option>
-<option value="19">Koreanisch (Südkorea) (Korean (South Korea))</option>
-</select> [<a href="../page?0-1.ILinkListener-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p>
-</form>
-<p>
-<form wicket:id="form" id="form3" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div><input type="text" wicket:id="dateTextField" value="xx.xx.xx" name="dateTextField" id="dateTextField1"/>
-<span class="yui-skin-sam"> <span style="display:none;position:absolute;z-index: 99999;" id="dateTextField1Dp"></span><img style="cursor: pointer; border: none;" id="dateTextField1Icon" src="../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/icon1.gif" alt="" title=""/></span> <input type="submit" value="submit" /></form>
-</p>
-<p>
- <div wicket:id="feedback"><wicket:panel>
-
-</wicket:panel></div>
-</p>
-</body>
-</html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Wicket Examples - dates</title>
+<link rel="stylesheet" type="text/css" href="../../style.css"/>
+<style type="text/css">
+/*<![CDATA[*/
+
+th {
+ color: grey;
+}
+
+/*]]>*/
+</style>
+<script type="text/javascript" src="../resource/org.apache.wicket.extensions.yui.YuiLib/yuiloader/yuiloader.js"></script>
+<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
+<script type="text/javascript" >
+/*<![CDATA[*/
+Wicket.Event.add(window, "domready", function(event) { /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+wicketCalendarInits = [];
+wicketCalendarInitFinished = false;
+wicketCalendarI18n = {};
+wicketCalendarAdd = function(initFn) {
+ if (wicketCalendarInitFinished) {
+ // when a DatePicker is added via ajax, the loader is already finished, so
+ // we call the init function directly.
+ initFn();
+ } else {
+ // when page is rendered, all calendar components will be initialized after
+ // the required js libraries have been loaded.
+ wicketCalendarInits.push(initFn);
+ }
+};
+
+var wicketYuiLoader = new YAHOO.util.YUILoader({
+ base: "../resource/org.apache.wicket.extensions.yui.YuiLib/",
+ filter: "RAW",
+ allowRollup: false,
+ require: ["wicket-date"],
+ onSuccess: function() {
+ wicketCalendarInitFinished = true;
+ while (wicketCalendarInits.length > 0) {
+ wicketCalendarInits.pop()();
+ }
+ }
+});
+wicketYuiLoader.addModule({
+ name: "wicket-date",
+ type: "js",
+ requires: ["calendar"],
+ fullpath: "../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/wicket-date.js"
+});
+wicketYuiLoader.insert();
+;});
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
+Wicket.Event.add(window, "domready", function(event) { wicketCalendarI18n["de"]={MONTHS_SHORT:["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],MONTHS_LONG:["Januar","Februar","M\u00E4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],WEEKDAYS_MEDIUM:["So","Mo","Di","Mi","Do","Fr","Sa"],WEEKDAYS_LONG:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],START_WEEKDAY:1,WEEKDAYS_1CHAR:["S","M","D","M","D","F","S"],WEEKDAYS_SHORT:["So","Mo","Di","Mi","Do","Fr","Sa"]};;});
+/*]]>*/
+</script>
+<script type="text/javascript" >
+/*<![CDATA[*/
+Wicket.Event.add(window, "domready", function(event) { /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+wicketCalendarAdd(function() {
+ Wicket.DateTime.init2("dateTextField1", "dateTextField1", {close:true,selected:"xx.xx.xxxx",pagedate:"xx.xxxx"}, "dd.MM.yy",
+ true, true, true, false, wicketCalendarI18n["de"], false);
+
+});
+;});
+/*]]>*/
+</script>
+</head>
+<body>
+<form wicket:id="localeForm" id="localeForm2" method="post" action="../page?0-1.IFormSubmitListener-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div>
+<p><select wicket:id="localeSelect" onchange="document.getElementById('localeForm2_hf_0').value='page?0-1.IOnChangeListener-localeForm-localeSelect';document.getElementById('localeForm2').submit();" name="localeSelect">
+<option value="0">Chinesisch (China) (Chinese (China))</option>
+<option value="1">Chinesisch (China) (Chinese (China))</option>
+<option value="2">Chinesisch (China) (Chinese (China))</option>
+<option value="3">Chinesisch (Taiwan) (Chinese (Taiwan))</option>
+<option value="4">Chinesisch (Taiwan) (Chinese (Taiwan))</option>
+<option selected="selected" value="5">Deutsch (German)</option>
+<option value="6">Deutsch (Deutschland) (German (Germany))</option>
+<option value="7">Englisch (English)</option>
+<option value="8">Englisch (Kanada) (English (Canada))</option>
+<option value="9">Englisch (Vereinigte Staaten von Amerika) (English (United States))</option>
+<option value="10">Englisch (Vereinigtes Königreich) (English (United Kingdom))</option>
+<option value="11">Französisch (French)</option>
+<option value="12">Französisch (Frankreich) (French (France))</option>
+<option value="13">Französisch (Kanada) (French (Canada))</option>
+<option value="14">Italienisch (Italian)</option>
+<option value="15">Italienisch (Italien) (Italian (Italy))</option>
+<option value="16">Japanisch (Japanese)</option>
+<option value="17">Japanisch (Japan) (Japanese (Japan))</option>
+<option value="18">Koreanisch (Korean)</option>
+<option value="19">Koreanisch (Südkorea) (Korean (South Korea))</option>
+</select> [<a href="../page?0-1.ILinkListener-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p>
+</form>
+<p>
+<form wicket:id="form" id="form3" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div><input type="text" wicket:id="dateTextField" value="xx.xx.xx" name="dateTextField" id="dateTextField1"/>
+<span class="yui-skin-sam"> <span style="display:none;position:absolute;z-index: 99999;" id="dateTextField1Dp"></span><img style="cursor: pointer; border: none;" id="dateTextField1Icon" src="../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/icon1.gif" alt="" title=""/></span> <input type="submit" value="submit" /></form>
+</p>
+<p>
+ <div wicket:id="feedback"><wicket:panel>
+
+</wicket:panel></div>
+</p>
+</body>
+</html>
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Thu Nov 17 13:44:34 2011
@@ -21,11 +21,10 @@ import java.util.Formatter;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IInitializer;
-import org.apache.wicket.ajax.WicketAjaxReference;
+import org.apache.wicket.ajax.AjaxLibrariesContributor;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.WicketEventReference;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.panel.Panel;
@@ -202,8 +201,8 @@ public class UploadProgressBar extends P
public void renderHead(final IHeaderResponse response)
{
super.renderHead(response);
- response.renderJavaScriptReference(WicketEventReference.INSTANCE);
- response.renderJavaScriptReference(WicketAjaxReference.INSTANCE);
+
+ AjaxLibrariesContributor.contribute(getApplication(), response);
response.renderJavaScriptReference(JS);
ResourceReference css = getCss();
if (css != null)
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1203187&r1=1203186&r2=1203187&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Thu Nov 17 13:44:34 2011
@@ -21,11 +21,9 @@ import org.apache.wicket.IClusterable;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxLibrariesContributor;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
-import org.apache.wicket.ajax.WicketAjaxReference;
-import org.apache.wicket.ajax.WicketEventReference;
-import org.apache.wicket.ajax.WicketJQueryReference;
import org.apache.wicket.ajax.calldecorator.CancelEventIfNoAjaxDecorator;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -262,9 +260,8 @@ public class ModalWindow extends Panel
public void renderHead(final IHeaderResponse response)
{
super.renderHead(response);
- response.renderJavaScriptReference(WicketJQueryReference.INSTANCE);
- response.renderJavaScriptReference(WicketEventReference.INSTANCE);
- response.renderJavaScriptReference(WicketAjaxReference.INSTANCE);
+
+ AjaxLibrariesContributor.contribute(getApplication(), response);
response.renderJavaScriptReference(JAVASCRIPT);
ResourceReference cssResource = newCssResource();