[MERGE] forward port branch saas-11.4 up to 6c103589c15

1 files changed, 14 insertions, 11 deletions

diff --git a/addons/web/static/src/js/services/ajax_service.js b/addons/web/static/src/js/services/ajax_service.js
index bf754792932..0cecaae9da3 100644
--- a/addons/web/static/src/js/services/ajax_service.js
+++ b/addons/web/static/src/js/services/ajax_service.js
@@ -7,17 +7,20 @@ var session = require('web.session');
 
 var AjaxService = AbstractService.extend({
     rpc: function (route, args, options, target) {
-        return $.Deferred(function (def) {
-            session.rpc(route, args, options).then(function () {
-                if (!target.isDestroyed()) {
-                    def.resolve.apply(def, arguments);
-                }
-            }, function () {
-                if (!target.isDestroyed()) {
-                    def.reject.apply(def, arguments);
-                }
-            });
-        }).promise();
+        var def = $.Deferred();
+        var promise = def.promise();
+        var xhrDef = session.rpc(route, args, options);
+        promise.abort = xhrDef.abort.bind(xhrDef);
+        xhrDef.then(function () {
+            if (!target.isDestroyed()) {
+                def.resolve.apply(def, arguments);
+            }
+        }).fail(function () {
+            if (!target.isDestroyed()) {
+                def.reject.apply(def, arguments);
+            }
+        });
+        return promise;
     },
 });