Skip to content
This repository has been archived by the owner on Dec 31, 2022. It is now read-only.

Commit

Permalink
fixing bug in 'resolve(..)' where 'then(..)' should have been called …
Browse files Browse the repository at this point in the history
…async instead of sync, closes #45 closes #46
  • Loading branch information
getify committed Jun 11, 2015
1 parent f3cc8e8 commit d40a2d0
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
23 changes: 15 additions & 8 deletions lib/npo.src.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*! Native Promise Only
v0.7.8-a (c) Kyle Simpson
v0.8.0-a (c) Kyle Simpson
MIT License: http://getify.mit-license.org
*/

Expand Down Expand Up @@ -137,7 +137,7 @@
}

function resolve(msg) {
var _then, def_wrapper, self = this;
var _then, self = this;

// already triggered?
if (self.triggered) { return; }
Expand All @@ -151,11 +151,18 @@

try {
if (_then = isThenable(msg)) {
def_wrapper = new MakeDefWrapper(self);
_then.call(msg,
function $resolve$(){ resolve.apply(def_wrapper,arguments); },
function $reject$(){ reject.apply(def_wrapper,arguments); }
);
schedule(function(){
var def_wrapper = new MakeDefWrapper(self);
try {
_then.call(msg,
function $resolve$(){ resolve.apply(def_wrapper,arguments); },
function $reject$(){ reject.apply(def_wrapper,arguments); }
);
}
catch (err) {
reject.call(def_wrapper,err);
}
})
}
else {
self.msg = msg;
Expand All @@ -166,7 +173,7 @@
}
}
catch (err) {
reject.call(def_wrapper || (new MakeDefWrapper(self)),err);
reject.call(new MakeDefWrapper(self),err);
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "native-promise-only",
"version": "0.7.8-a",
"version": "0.8.0-a",
"description": "Native Promise Only: A polyfill for native ES6 Promises **only**, nothing else.",
"main": "./npo.js",
"scripts": {
Expand Down

0 comments on commit d40a2d0

Please sign in to comment.