[MERGE] callback2deferred session.rpc

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

diff --cc addons/web/static/src/js/chrome.js
index fe5812a,985912d..80693d2
--- 1/addons/web/static/src/js/chrome.js
--- 2/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@@ -1165,8 -1165,8 +1165,8 @@@ instance.web.EmbeddedClient = instance.
          var self = this;
          return $.when(this._super()).pipe(function() {
              return instance.session.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() {
-                 return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) {
+                 return self.rpc("/web/action/load", { action_id: self.action_id }).then(function(result) {
 -                    var action = result.result;
 +                    var action = result;
                      action.flags = _.extend({
                          //views_switcher : false,
                          search_view : false,

diff --cc addons/web/static/src/js/corelib.js
index da7e8b5,d6dfac9..ff19360
--- 1/addons/web/static/src/js/corelib.js
--- 2/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@@ -1317,8 -1316,8 +1317,6 @@@ instance.web.JsonRPC = instance.web.Cal
          };
          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 -1341,16 +1340,6 @@@
                  };
                  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) {

diff --cc addons/web/static/src/js/coresetup.js
Simple merge

diff --cc addons/web/static/src/js/data_export.js
Simple merge

diff --cc addons/web/static/src/js/search.js
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/js/views.js
Simple merge