[MERGE] callback2deferred session.rpc

bzr revid: al@openerp.com-20121006163238-7ni5r324c0yqi5a0

1 files changed, 3 insertions, 15 deletions

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index da7e8b584ef..ff193605033 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -842,7 +842,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
-        instance.session.rpc(url, data). then(function() {
+        instance.session.rpc(url, data).then(function() {
             if (!self.isDestroyed())
                 def.resolve.apply(def, arguments);
         }, function() {
@@ -1300,7 +1300,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
      * @param {Function} error_callback function to execute on RPC call failure
      * @returns {jQuery.Deferred} jquery-provided ajax deferred
      */
-    rpc: function(url, params, success_callback, error_callback) {
+    rpc: function(url, params) {
         var self = this;
         // url can be an $.ajax option object
         if (_.isString(url)) {
@@ -1317,8 +1317,6 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
         };
         var deferred = $.Deferred();
         this.trigger('request', url, payload);
-        var aborter = params.aborter;
-        delete params.aborter;
         var request = this.rpc_function(url, payload).then(
             function (response, textStatus, jqXHR) {
                 self.trigger('response', response);
@@ -1342,16 +1340,6 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
                 };
                 deferred.reject(error, $.Event());
             });
-        if (aborter) {
-            aborter.abort_last = function () {
-                if (!(request.isResolved() || request.isRejected())) {
-                    deferred.fail(function (error, event) {
-                        event.preventDefault();
-                    });
-                    request.abort();
-                }
-            };
-        }
         // Allow deferred user to disable on_rpc_error in fail
         deferred.fail(function() {
             deferred.fail(function(error, event) {
@@ -1359,7 +1347,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
                     self.on_rpc_error(error, event);
                 }
             });
-        }).then(success_callback, error_callback).promise();
+        });
         return deferred;
     },
     /**