Author: mgrigorov
Date: Thu Nov 17 11:17:20 2011
New Revision: 1203152
URL: http://svn.apache.org/viewvc?rev=1203152&view=rev
Log:
WICKET-4236 Use JQuery as a backing library for Wicket's JavaScript code
Added:
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/ajax/res/
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/jquery/
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/jquery/jquery.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/jquery/jquery.min.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
wicket/trunk/wicket-core/src/test/js/
wicket/trunk/wicket-core/src/test/js/ajax.js
wicket/trunk/wicket-core/src/test/js/all.html
wicket/trunk/wicket-core/src/test/js/data/
wicket/trunk/wicket-core/src/test/js/data/test.css
wicket/trunk/wicket-core/src/test/js/data/test.js
wicket/trunk/wicket-core/src/test/js/dom.js
wicket/trunk/wicket-core/src/test/js/event.js
wicket/trunk/wicket-core/src/test/js/form.js
wicket/trunk/wicket-core/src/test/js/head.js
wicket/trunk/wicket-core/src/test/js/qunit/
wicket/trunk/wicket-core/src/test/js/qunit/qunit.css
wicket/trunk/wicket-core/src/test/js/qunit/qunit.js
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax-debug.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.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/form/AbstractCheckSelector.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxSelector.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroupSelector.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckboxMultipleChoiceSelector.js
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/wicket-event.js
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/license/ApacheLicenceHeaderTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java?rev=1203152&r1=1203151&r2=1203152&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
Thu Nov 17 11:17:20 2011
@@ -122,7 +122,7 @@ public abstract class AbstractAjaxTimerB
@Override
protected CharSequence getCallbackScript()
{
- return generateCallbackScript("wicketAjaxGet('" +
getCallbackUrl() + "'");
+ return generateCallbackScript("Wicket.Ajax.get('" +
getCallbackUrl() + "'");
}
/**
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=1203152&r1=1203151&r2=1203152&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 11:17:20 2011
@@ -22,7 +22,6 @@ import org.apache.wicket.Page;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.markup.html.IComponentAwareHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.WicketEventReference;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -53,7 +52,7 @@ public abstract class AbstractDefaultAja
/** reference to the default ajax debug support javascript file. */
private static final ResourceReference JAVASCRIPT_DEBUG = new
JavaScriptResourceReference(
- AbstractDefaultAjaxBehavior.class, "wicket-ajax-debug.js");
+ AbstractDefaultAjaxBehavior.class,
"res/js/wicket-ajax-jquery-debug.js");
/**
* Subclasses should call super.onBind()
@@ -74,6 +73,7 @@ public abstract class AbstractDefaultAja
{
super.renderHead(component, response);
+
response.renderJavaScriptReference(WicketJQueryReference.INSTANCE);
response.renderJavaScriptReference(WicketEventReference.INSTANCE);
response.renderJavaScriptReference(WicketAjaxReference.INSTANCE);
@@ -81,7 +81,8 @@ public abstract class AbstractDefaultAja
if (debugSettings.isAjaxDebugModeEnabled())
{
response.renderJavaScriptReference(JAVASCRIPT_DEBUG);
-
response.renderJavaScript("wicketAjaxDebugEnable=true;",
"wicket-ajax-debug-enable");
+
response.renderJavaScript("Wicket.Ajax.DebugWindow.enabled=true;",
+ "wicket-ajax-debug-enable");
}
Url baseUrl = RequestCycle.get().getUrlRenderer().getBaseUrl();
@@ -111,7 +112,7 @@ public abstract class AbstractDefaultAja
*/
protected CharSequence getCallbackScript()
{
- return generateCallbackScript("wicketAjaxGet('" +
getCallbackUrl() + "'");
+ return generateCallbackScript("Wicket.Ajax.get('" +
getCallbackUrl() + "'");
}
/**
@@ -179,7 +180,7 @@ public abstract class AbstractDefaultAja
if (!Strings.isEmpty(indicatorId))
{
- String hide = ";Wicket.hideIncrementally('" +
indicatorId + "');";
+ String hide = "; Wicket.DOM.hideIncrementally('" +
indicatorId + "');";
success = success + hide;
failure = failure + hide;
}
@@ -233,7 +234,7 @@ public abstract class AbstractDefaultAja
{
indicatorWithPrecondition.append("true");
}
- indicatorWithPrecondition.append(") {
Wicket.showIncrementally('")
+ indicatorWithPrecondition.append(") {
Wicket.DOM.showIncrementally('")
.append(indicatorId)
.append("');}")
.append(call);
@@ -353,7 +354,7 @@ public abstract class AbstractDefaultAja
Args.notEmpty(throttleId, "throttleId");
Args.notNull(throttleDelay, "throttleDelay");
- return new AppendingStringBuffer("wicketThrottler.throttle(
'").append(throttleId)
+ return new AppendingStringBuffer("Wicket.throttler.throttle(
'").append(throttleId)
.append("', ")
.append(throttleDelay.getMilliseconds())
.append(", function() { ")
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java?rev=1203152&r1=1203151&r2=1203152&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
Thu Nov 17 11:17:20 2011
@@ -35,6 +35,6 @@ public class WicketAjaxReference extends
private WicketAjaxReference()
{
- super(WicketAjaxReference.class, "wicket-ajax.js");
+ super(WicketAjaxReference.class,
"res/js/wicket-ajax-jquery.js");
}
}
Added:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventReference.java?rev=1203152&view=auto
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventReference.java
(added)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventReference.java
Thu Nov 17 11:17:20 2011
@@ -0,0 +1,42 @@
+/*
+ * 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.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
+
+/**
+ * Resource reference to wicket-event.js which is used to allow events via
javascript
+ *
+ * @author ivaynberg
+ */
+public class WicketEventReference extends JavaScriptResourceReference
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Singleton instance of this reference
+ */
+ public static final ResourceReference INSTANCE = new
WicketEventReference();
+
+ private WicketEventReference()
+ {
+ super(WicketEventReference.class,
"res/js/wicket-event-jquery.js");
+ }
+
+
+}
Added:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketJQueryReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketJQueryReference.java?rev=1203152&view=auto
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketJQueryReference.java
(added)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/WicketJQueryReference.java
Thu Nov 17 11:17:20 2011
@@ -0,0 +1,38 @@
+/*
+ * 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.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
+
+/**
+ *
+ */
+public class WicketJQueryReference extends JavaScriptResourceReference
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Singleton instance of this reference
+ */
+ public static final ResourceReference INSTANCE = new
WicketJQueryReference();
+
+ private WicketJQueryReference()
+ {
+ super(WicketJQueryReference.class, "res/js/jquery/jquery.js");
+ }
+}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java?rev=1203152&r1=1203151&r2=1203152&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
Thu Nov 17 11:17:20 2011
@@ -64,13 +64,13 @@ public abstract class AjaxFormChoiceComp
AppendingStringBuffer asb = new AppendingStringBuffer();
asb.append("function attachChoiceHandlers(markupId,
callbackScript) {\n");
- asb.append(" var inputNodes =
wicketGet(markupId).getElementsByTagName('input');\n");
+ asb.append(" var inputNodes =
Wicket.$(markupId).getElementsByTagName('input');\n");
asb.append(" for (var i = 0 ; i < inputNodes.length ; i ++)
{\n");
asb.append(" var inputNode = inputNodes[i];\n");
asb.append(" if (!inputNode.type) continue;\n");
asb.append(" if
(!(inputNode.className.indexOf('wicket-'+markupId)>=0)&&!(inputNode.id.indexOf(markupId+'-')>=0))
continue;\n");
asb.append(" var inputType = inputNode.type.toLowerCase();\n");
- asb.append(" if (inputType == 'checkbox' || inputType ==
'radio') {\n");
+ asb.append(" if (inputType === 'checkbox' || inputType ===
'radio') {\n");
asb.append(" Wicket.Event.add(inputNode, 'click',
callbackScript);\n");
asb.append(" }\n");
asb.append(" }\n");
@@ -144,9 +144,9 @@ public abstract class AjaxFormChoiceComp
*/
protected final CharSequence getEventHandler()
{
- return generateCallbackScript(new
AppendingStringBuffer("wicketAjaxPost('").append(
+ return generateCallbackScript(new
AppendingStringBuffer("Wicket.Ajax.post('").append(
getCallbackUrl()).append(
- "', wicketSerializeForm(document.getElementById('" +
getComponent().getMarkupId() +
+ "', Wicket.Form.serialize(document.getElementById('" +
getComponent().getMarkupId() +
"',false))"));
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?rev=1203152&r1=1203151&r2=1203152&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
Thu Nov 17 11:17:20 2011
@@ -104,9 +104,9 @@ public abstract class AjaxFormComponentU
@Override
protected final CharSequence getEventHandler()
{
- return generateCallbackScript(new
AppendingStringBuffer("wicketAjaxPost('").append(
+ return generateCallbackScript(new
AppendingStringBuffer("Wicket.Ajax.post('").append(
getCallbackUrl()).append(
- "', wicketSerialize(Wicket.$('" +
getComponent().getMarkupId() + "'))"));
+ "', Wicket.Form.serialize(Wicket.$('" +
getComponent().getMarkupId() + "'))"));
}
/**
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java?rev=1203152&r1=1203151&r2=1203152&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
Thu Nov 17 11:17:20 2011
@@ -129,7 +129,7 @@ public abstract class AjaxFormSubmitBeha
final String formId = getForm().getMarkupId();
final CharSequence url = getCallbackUrl();
- AppendingStringBuffer call = new
AppendingStringBuffer("wicketSubmitFormById('").append(
+ AppendingStringBuffer call = new
AppendingStringBuffer("Wicket.Ajax.submitForm('").append(
formId)
.append("', '")
.append(url)
@@ -204,7 +204,7 @@ public abstract class AjaxFormSubmitBeha
@Override
protected CharSequence getPreconditionScript()
{
- return "return Wicket.$$(this)&&Wicket.$$('" +
getForm().getMarkupId() + "')";
+ return "return Wicket.$$(this) && Wicket.$$('" +
getForm().getMarkupId() + "')";
}
/**
