diff options
Diffstat (limited to 'deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bind.js')
-rw-r--r-- | deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bind.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bind.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bind.js index d6f6da257..9d8257ae5 100644 --- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bind.js +++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bind.js @@ -10,7 +10,6 @@ var targetRejected = function(e, context) { }; var bindingResolved = function(thisArg, context) { - this._setBoundTo(thisArg); if (this._isPending()) { this._resolveCallback(context.target); } @@ -25,6 +24,8 @@ Promise.prototype.bind = function (thisArg) { var ret = new Promise(INTERNAL); ret._propagateFrom(this, 1); var target = this._target(); + + ret._setBoundTo(maybePromise); if (maybePromise instanceof Promise) { var context = { promiseRejectionQueued: false, @@ -36,7 +37,6 @@ Promise.prototype.bind = function (thisArg) { maybePromise._then( bindingResolved, bindingRejected, ret._progress, ret, context); } else { - ret._setBoundTo(thisArg); ret._resolveCallback(target); } return ret; @@ -59,13 +59,12 @@ Promise.bind = function (thisArg, value) { var maybePromise = tryConvertToPromise(thisArg); var ret = new Promise(INTERNAL); + ret._setBoundTo(maybePromise); if (maybePromise instanceof Promise) { - maybePromise._then(function(thisArg) { - ret._setBoundTo(thisArg); + maybePromise._then(function() { ret._resolveCallback(value); }, ret._reject, ret._progress, ret, null); } else { - ret._setBoundTo(thisArg); ret._resolveCallback(value); } return ret; |