[MERGE] forward port of branch 8.0 up to 2b192be

1 files changed, 14 insertions, 14 deletions

diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js
index 77be9fd6ba8..fd13bea49cb 100644
--- a/addons/web/static/src/js/openerpframework.js
+++ b/addons/web/static/src/js/openerpframework.js
@@ -258,24 +258,24 @@ openerp.ParentedMixin = {
                               current object is destroyed.
     */
     alive: function(promise, reject) {
-        var def = $.Deferred();
         var self = this;
-        promise.done(function() {
-            if (! self.isDestroyed()) {
-                if (! reject)
+        return $.Deferred(function (def) {
+            promise.then(function () {
+                if (!self.isDestroyed()) {
                     def.resolve.apply(def, arguments);
-                else
-                    def.reject();
-            }
-        }).fail(function() {
-            if (! self.isDestroyed()) {
-                if (! reject)
+                }
+            }, function () {
+                if (!self.isDestroyed()) {
                     def.reject.apply(def, arguments);
-                else
+                }
+            }).always(function () {
+                if (reject) {
+                    // noop if def already resolved or rejected
                     def.reject();
-            }
-        });
-        return def.promise();
+                }
+                // otherwise leave promise in limbo
+            });
+        }).promise();
     },
     /**
      * Inform the object it should destroy itself, releasing any