Updated Branches: refs/heads/master 0e1199e29 -> ac2d03964
Wicket.Ajax.Call.doAjax() now returns the jQuery-ed XMLHttpRequest to be able to use it as a Promise if necessary. The event listener always returns the value of 'allowDefault' request attribute. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ac2d0396 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ac2d0396 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ac2d0396 Branch: refs/heads/master Commit: ac2d0396415e93c60bef2e9fde026b7b7e7322c8 Parents: 4967dec Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Feb 6 10:20:53 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Feb 6 10:20:53 2012 +0200 ---------------------------------------------------------------------- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ac2d0396/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 6600590..4b17e62 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 @@ -476,7 +476,7 @@ data = jQuery.param(data, true); // execute the request - jQuery.ajax({ + var jqXHR = jQuery.ajax({ url: attrs.u, type: attrs.m, context: self, @@ -557,7 +557,7 @@ attrs.event.preventDefault(); } - return attrs.ad; + return jqXHR; }, /** @@ -1276,7 +1276,6 @@ Wicket.DOM.show(e); } e.setAttribute("showIncrementallyCount", count + 1); - }, /** call-counting implementation of Wicket.DOM.hide() */ @@ -1477,11 +1476,13 @@ var throttler = new Wicket.Throttler(postponeTimerOnUpdate); throttler.throttle(throttlingSettings.id, throttlingSettings.d, Wicket.bind(function () { - return call.ajax(attrs); + call.ajax(attrs); + return attrs.ad; }, this)); } else { - return call.ajax(attrs); + call.ajax(attrs); + return attrs.ad; } }); });
