WICKET-3367
Rewrite all JavaScript inline event handlers to be proper attached event 
handlers

Add a test that verifies that all default attributes are properly set at the 
client side.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/90c12193
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/90c12193
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/90c12193

Branch: refs/heads/master
Commit: 90c1219351b69e177d5faf98efd5671032f74f15
Parents: 43fcea7
Author: martin-g <[email protected]>
Authored: Fri Jan 6 10:05:29 2012 +0200
Committer: martin-g <[email protected]>
Committed: Fri Jan 6 10:05:29 2012 +0200

----------------------------------------------------------------------
 .../wicket/ajax/CancelEventIfAjaxListener.java     |    2 +-
 .../wicket/ajax/res/js/wicket-ajax-jquery.js       |   46 ++++++++++-----
 wicket-core/src/test/js/ajax.js                    |   44 ++++++++++++++
 3 files changed, 75 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/90c12193/wicket-core/src/main/java/org/apache/wicket/ajax/CancelEventIfAjaxListener.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/ajax/CancelEventIfAjaxListener.java
 
b/wicket-core/src/main/java/org/apache/wicket/ajax/CancelEventIfAjaxListener.java
index 69bccac..cccd797 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/ajax/CancelEventIfAjaxListener.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/ajax/CancelEventIfAjaxListener.java
@@ -41,6 +41,6 @@ public final class CancelEventIfAjaxListener extends 
AjaxCallListener
        @Override
        public CharSequence getBeforeHandler(Component component)
        {
-               return "if (attrs.event) { 
Wicket.Event.fix(attrs.event).preventDefault(); }";
+               return "if (attrs.event) { attrs.event.preventDefault(); }";
        }
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/90c12193/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js 
b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index eaede26..ef1ea7d 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ 
b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -312,7 +312,7 @@
 
                initialize: jQuery.noop,
 
-               _normalizeAttributes: function (attrs) {
+               _initializeDefaults: function (attrs) {
 
                        // (ajax channel)
                        if (typeof(attrs.ch) !== 'string') {
@@ -327,7 +327,23 @@
                        // (dataType) by default we expect XML responses from 
the Ajax behaviors
                        if (typeof(attrs.dt) !== 'string') {
                                attrs.dt = 'xml';
-                       }       
+                       }
+
+                       if (typeof(attrs.m) != 'string') {
+                               attrs.m = 'GET';
+                       }
+
+                       if (attrs.async !== true) {
+                               attrs.async = false;
+                       }
+
+                       if (!jQuery.isNumeric(attrs.rt)) {
+                               attrs.rt = 0;
+                       }
+
+                       if (attrs.ad !== true) {
+                               attrs.ad = false;
+                       }
                },
 
                /**
@@ -357,7 +373,7 @@
                 * @param {Object} attrs - the Ajax request attributes 
configured at the server side
                 */
                ajax: function (attrs) {
-                       this._normalizeAttributes(attrs);
+                       this._initializeDefaults(attrs);
 
                        var res = Wicket.channelManager.schedule(attrs.ch, 
Wicket.bind(function () {
                                this.doAjax(attrs);
@@ -432,7 +448,7 @@
                                        data = jQuery.extend({}, data, {scName: 
1});
                                }
 
-                       } else if (attrs.c) {
+                       } else if (attrs.c && !jQuery.isWindow(attrs.c)) {
                                // serialize just the form component with id == 
attrs.c
                                var el = Wicket.$(attrs.c);
                                data = jQuery.extend({}, data, 
Wicket.Form.serializeElement(el));
@@ -444,7 +460,7 @@
                        // execute the request 
                        jQuery.ajax({
                                url: attrs.u,
-                               type: attrs.m || 'GET',
+                               type: attrs.m,
                                context: self,
                                beforeSend: function (jqXHR, settings) {
 
@@ -476,8 +492,8 @@
                                },
                                data: data,
                                dataType: attrs.dt,
-                               async: attrs.async || true,
-                               timeout: attrs.rt || 0,
+                               async: attrs.async,
+                               timeout: attrs.rt,
                                headers: headers,
                                success: function(data, textStatus, jqXHR) {
 
@@ -507,13 +523,11 @@
                        // execute after handlers right after the Ajax request 
is fired
                        self._executeHandlers(attrs.ah, attrs);
 
-                       var allowDefault = attrs.ad || false; 
-
-                       if (!allowDefault && attrs.event) {
-                               Wicket.Event.fix(attrs.event).preventDefault();
+                       if (!attrs.ad && attrs.event) {
+                               attrs.event.preventDefault();
                        }
 
-                       return allowDefault;
+                       return attrs.ad;
                },
 
                // Method that processes the <ajax-response>
@@ -1430,17 +1444,17 @@
 
                        ajax: function(attrs) {
 
-                               var target      = attrs.c || window;
-                               attrs.e = attrs.e || [ 'domready' ];
+                               attrs.c = attrs.c || window;
+                               attrs.e = attrs.e || [ 'domready' ];
 
                                if (!jQuery.isArray(attrs.e)) {
                                        attrs.e = [ attrs.e ];
                                }
 
                                jQuery.each(attrs.e, function (idx, evt) {
-                                       Wicket.Event.add(target, evt, function 
(jqEvent) {
+                                       Wicket.Event.add(attrs.c, evt, function 
(jqEvent) {
                                                var call = new 
Wicket.Ajax.Call();
-                                               attrs.event = jqEvent;
+                                               attrs.event = 
Wicket.Event.fix(jqEvent);
 
                                                var throttlingSettings = 
attrs.tr;
                                                if (throttlingSettings) {

http://git-wip-us.apache.org/repos/asf/wicket/blob/90c12193/wicket-core/src/test/js/ajax.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/ajax.js b/wicket-core/src/test/js/ajax.js
index 3a2b4c6..4f0509c 100644
--- a/wicket-core/src/test/js/ajax.js
+++ b/wicket-core/src/test/js/ajax.js
@@ -387,5 +387,49 @@ jQuery(document).ready(function() {
                        target.triggerHandler("event1");
                        target.off("event1");
                });
+
+               /**
+                * Only attributes with non-default values are transfered to 
the client side.
+                * All defaults are initialized at the client side.
+                */
+               asyncTest('Wicket.Ajax - verify default attributes.', function 
() {
+
+                       expect(23);
+
+                       var attrs = {
+                               u: 'data/ajax/nonWicketResponse.json',
+                               coh: [
+                                       function(jqXHR, textStatus, attributes) 
{
+                                               start();
+                                               equal(textStatus, 
"parsererror", "textStatus")
+                                               equal(attributes.u, attrs.u, 
"url");
+                                               deepEqual(attributes.e, [ 
"domready" ], "events");
+                                               equal(attributes.ch, '0|s', 
'channel');
+                                               equal(attributes.dt, 'xml', 
'data type');
+                                               equal(attributes.wr, true, 
'wicket ajax response');
+                                               equal(attributes.m, 'GET', 
'method');
+                                               
ok(jQuery.isWindow(attributes.c), 'component');
+                                               ok(attributes.f === undefined, 
'form');
+                                               ok(attributes.mp === undefined, 
'multipart');
+                                               ok(attributes.sc === undefined, 
'submitting component');
+                                               ok(attributes.i === undefined, 
'indicator');
+                                               ok(attributes.pre === 
undefined, 'preconditions');
+                                               ok(attributes.bh === undefined, 
'before handlers');
+                                               ok(attributes.ah === undefined, 
'after handler');
+                                               ok(attributes.sh === undefined, 
'success handlers');
+                                               ok(attributes.fh === undefined, 
'failure handlers');
+                                               deepEqual(attrs.coh, 
attributes.coh, 'complete handlers');
+                                               ok(attributes.ep === undefined, 
'extra parameters');
+                                               ok(attributes.dep === 
undefined, 'dynamic extra parameters');
+                                               equal(attributes.async, false, 
'asynchronous');
+                                               equal(attributes.rt, 0, 
'request timeout');
+                                               equal(attributes.ad, false, 
'allow default');
+
+                                       }
+                               ]
+                       }
+
+                       Wicket.Ajax.ajax(attrs);
+               });
        }
 });

Reply via email to