svn commit: r1204897 - in /wicket/trunk: wicket-core/src/main/java/org/apache/wicket/ajax/ wicket-core/src/main/java/org/apache/wicket/markup/html/form/ wicket-core/src/main/java/org/apache/wicket/markup/html/internal/ wicket-core/src/test/java/org/apa...

Tue, 22 Nov 2011 02:13:54 -0800 

Author: mgrigorov
Date: Tue Nov 22 10:13:20 2011
New Revision: 1204897

URL: http://svn.apache.org/viewvc?rev=1204897&view=rev
Log:
WICKET-4236 Use JQuery as a backing library for Wicket's JavaScript code

Optimize core js libraries contribution. Sometimes wicket-ajax is not needed. 
Just wicket-event is needed for renderOn(DomReady|Load)JS()


Added:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/CoreLibrariesContributor.java
      - copied, changed from r1204850, 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java
Removed:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java
Modified:
    
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/ajax/AjaxHeaderContributionPage2_expected.html
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
    
wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java
    
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/ajax/AbstractDefaultAjaxBehavior.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=1204897&r1=1204896&r2=1204897&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
 Tue Nov 22 10:13:20 2011
@@ -66,7 +66,7 @@ public abstract class AbstractDefaultAja
        {
                super.renderHead(component, response);
 
-               AjaxLibrariesContributor.contribute(component.getApplication(), 
response);
+               
CoreLibrariesContributor.contributeAjax(component.getApplication(), response);
 
                Url baseUrl = RequestCycle.get().getUrlRenderer().getBaseUrl();
                CharSequence ajaxBaseUrl = 
Strings.escapeMarkup(baseUrl.toString());

Copied: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/CoreLibrariesContributor.java
 (from r1204850, 
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/CoreLibrariesContributor.java?p2=wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/CoreLibrariesContributor.java&p1=wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java&r1=1204850&r2=1204897&rev=1204897&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxLibrariesContributor.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/CoreLibrariesContributor.java
 Tue Nov 22 10:13:20 2011
@@ -28,12 +28,11 @@ import org.apache.wicket.settings.IDebug
  * 
  * @since 6.0
  */
-public class AjaxLibrariesContributor
+public class CoreLibrariesContributor
 {
 
        /**
-        * 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.
+        * Contributes the backing library plus the implementation of 
Wicket.Event.
         * 
         * @param application
         *            the application instance
@@ -44,14 +43,30 @@ public class AjaxLibrariesContributor
        {
                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);
 
+       }
+
+       /**
+        * 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 contributeAjax(final Application application, final 
IHeaderResponse response)
+       {
+               CoreLibrariesContributor.contribute(application, response);
+
+               IAjaxSettings ajaxSettings = application.getAjaxSettings();
+               ResourceReference wicketAjaxReference = 
ajaxSettings.getWicketAjaxReference();
+
+               response.renderJavaScriptReference(wicketAjaxReference);
 
                final IDebugSettings debugSettings = 
application.getDebugSettings();
                if (debugSettings.isAjaxDebugModeEnabled())

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=1204897&r1=1204896&r2=1204897&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
 Tue Nov 22 10:13:20 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup.html.form;
 
-import org.apache.wicket.ajax.AjaxLibrariesContributor;
+import org.apache.wicket.ajax.CoreLibrariesContributor;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.IHeaderContributor;
 import org.apache.wicket.markup.html.IHeaderResponse;
@@ -69,7 +69,7 @@ public abstract class AbstractCheckSelec
        public void renderHead(IHeaderResponse response)
        {
                // make sure we have all the javascript we need
-               AjaxLibrariesContributor.contribute(getApplication(), response);
+               CoreLibrariesContributor.contributeAjax(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=1204897&r1=1204896&r2=1204897&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
 Tue Nov 22 10:13:20 2011
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.wicket.Application;
-import org.apache.wicket.ajax.AjaxLibrariesContributor;
+import org.apache.wicket.ajax.CoreLibrariesContributor;
 import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.request.IRequestHandler;
 import org.apache.wicket.request.Response;
@@ -369,7 +369,7 @@ public abstract class HeaderResponse imp
                        List<String> token = Arrays.asList("javascript-event", 
target, event, javascript);
                        if (wasRendered(token) == false)
                        {
-                               
AjaxLibrariesContributor.contribute(Application.get(), this);
+                               
CoreLibrariesContributor.contribute(Application.get(), this);
                                JavaScriptUtils.writeJavaScript(getResponse(), 
"Wicket.Event.add(" + target +
                                        ", \"" + event + "\", function(event) { 
" + javascript + ";});");
                                markRendered(token);

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=1204897&r1=1204896&r2=1204897&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
 Tue Nov 22 10:13:20 2011
@@ -4,13 +4,6 @@
 <script type="text/javascript" src="../../javascripturl"></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;
-/*]]>*/
-</script>
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { domReady();;});
@@ -34,6 +27,13 @@ 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.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;
+/*]]>*/
+</script>
 <script type="text/javascript" id="wicket-ajax-base-url">
 /*<![CDATA[*/
 
Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContributionPage2?0";

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=1204897&r1=1204896&r2=1204897&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
 Tue Nov 22 10:13:20 2011
@@ -4,13 +4,6 @@
 <script type="text/javascript" src="../../javascripturl"></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;
-/*]]>*/
-</script>
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { domReady();;});
@@ -21,6 +14,13 @@ 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.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;
+/*]]>*/
+</script>
 <script type="text/javascript" id="wicket-ajax-base-url">
 /*<![CDATA[*/
 
Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContributionPage?0";

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=1204897&r1=1204896&r2=1204897&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
 Tue Nov 22 10:13:20 2011
@@ -15,13 +15,6 @@ th {
 <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/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;
-/*]]>*/
-</script>
 <script type="text/javascript" >
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { /*

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java?rev=1204897&r1=1204896&r2=1204897&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/GroupingHeaderResponse.java
 Tue Nov 22 10:13:20 2011
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.wicket.Application;
-import org.apache.wicket.ajax.AjaxLibrariesContributor;
+import org.apache.wicket.ajax.CoreLibrariesContributor;
 import 
org.apache.wicket.examples.resourcedecoration.GroupedAndOrderedResourceReference.ResourceGroup;
 import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -152,7 +152,7 @@ public class GroupingHeaderResponse
        @Override
        public void renderOnDomReadyJavaScript(final String javascript)
        {
-               AjaxLibrariesContributor.contribute(Application.get(), this);
+               CoreLibrariesContributor.contribute(Application.get(), this);
                toJsResponse(new Runnable()
                {
                        public void run()
@@ -166,7 +166,7 @@ public class GroupingHeaderResponse
        public void renderOnEventJavaScript(final String target, final String 
event,
                final String javascript)
        {
-               AjaxLibrariesContributor.contribute(Application.get(), this);
+               CoreLibrariesContributor.contribute(Application.get(), this);
                toJsResponse(new Runnable()
                {
                        public void run()

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=1204897&r1=1204896&r2=1204897&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
 Tue Nov 22 10:13:20 2011
@@ -21,7 +21,7 @@ import java.util.Formatter;
 import org.apache.wicket.Application;
 import org.apache.wicket.Component;
 import org.apache.wicket.IInitializer;
-import org.apache.wicket.ajax.AjaxLibrariesContributor;
+import org.apache.wicket.ajax.CoreLibrariesContributor;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -202,7 +202,7 @@ public class UploadProgressBar extends P
        {
                super.renderHead(response);
 
-               AjaxLibrariesContributor.contribute(getApplication(), response);
+               CoreLibrariesContributor.contributeAjax(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=1204897&r1=1204896&r2=1204897&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
 Tue Nov 22 10:13:20 2011
@@ -21,8 +21,8 @@ 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.CoreLibrariesContributor;
 import org.apache.wicket.ajax.IAjaxCallDecorator;
 import org.apache.wicket.ajax.calldecorator.CancelEventIfNoAjaxDecorator;
 import org.apache.wicket.markup.ComponentTag;
@@ -261,7 +261,7 @@ public class ModalWindow extends Panel
        {
                super.renderHead(response);
 
-               AjaxLibrariesContributor.contribute(getApplication(), response);
+               CoreLibrariesContributor.contributeAjax(getApplication(), 
response);
                response.renderJavaScriptReference(JAVASCRIPT);
 
                ResourceReference cssResource = newCssResource();

Reply via email to