Updated Branches: refs/heads/master 43adcf3c6 -> 6d0df2b26
WICKET-3367 Rewrite all JavaScript inline event handlers to be proper attached event handlers Fix Autocomplete example by executing only the success handlers if the response is not <ajax-response>. Add a unit test for this. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6d0df2b2 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6d0df2b2 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6d0df2b2 Branch: refs/heads/master Commit: 6d0df2b26128653a928592c08c5b39969452cebb Parents: 2be01b7 Author: martin-g <[email protected]> Authored: Mon Jan 2 15:17:32 2012 +0200 Committer: martin-g <[email protected]> Committed: Mon Jan 2 15:17:32 2012 +0200 ---------------------------------------------------------------------- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 2 + .../util/license/ApacheLicenceHeaderTest.java | 1 + wicket-core/src/test/js/ajax.js | 24 +++++++++++++++ .../src/test/js/data/ajax/nonWicketResponse.json | 5 +++ .../license/JavaScriptLicenseHeaderHandler.java | 2 +- 5 files changed, 33 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6d0df2b2/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 4a1ec0c..ef05be0 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 @@ -483,6 +483,8 @@ if (attrs.wr) { self.processAjaxResponse(data, textStatus, jqXHR, attrs); + } else { + self._executeHandlers(attrs.sh, data, textStatus, jqXHR); } }, http://git-wip-us.apache.org/repos/asf/wicket/blob/6d0df2b2/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java index c787bfb..5d98b41 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java @@ -95,5 +95,6 @@ public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase javaScriptIgnore.add("src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js"); javaScriptIgnore.add("src/main/java/org/apache/wicket/resource/jquery"); javaScriptIgnore.add("src/test/js/qunit/qunit.js"); + javaScriptIgnore.add("src/test/js/data/ajax/nonWicketResponse.json"); // no way to add licence in JSON } } http://git-wip-us.apache.org/repos/asf/wicket/blob/6d0df2b2/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 df2d596..ed7c65e 100644 --- a/wicket-core/src/test/js/ajax.js +++ b/wicket-core/src/test/js/ajax.js @@ -186,5 +186,29 @@ jQuery(document).ready(function() { } execute(attrs); }); + + asyncTest('Wicket.Ajax - non-wicket response.', function () { + + expect(2); + + var attrs = { + u: 'data/ajax/nonWicketResponse.json', + dt: 'json', // datatype + wr: false, // not Wicket's <ajax-response> + sh: [ + function(data, textStatus, jqXHR) { + start(); + var expected = { + one: 1, + two: '2', + three: true + }; + deepEqual(data, expected); + equal('success', textStatus); + } + ] + } + execute(attrs); + }); } }); http://git-wip-us.apache.org/repos/asf/wicket/blob/6d0df2b2/wicket-core/src/test/js/data/ajax/nonWicketResponse.json ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/js/data/ajax/nonWicketResponse.json b/wicket-core/src/test/js/data/ajax/nonWicketResponse.json new file mode 100644 index 0000000..666ceef --- /dev/null +++ b/wicket-core/src/test/js/data/ajax/nonWicketResponse.json @@ -0,0 +1,5 @@ +{ + "one": 1, + "two": "2", + "three": true +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/6d0df2b2/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java index 09e8a51..f9fbd0f 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java @@ -47,7 +47,7 @@ class JavaScriptLicenseHeaderHandler extends AbstractLicenseHeaderHandler public List<String> getSuffixes() { - return Arrays.asList("js"); + return Arrays.asList("js", "json"); } @Override
