Skip to content

Commit

Permalink
Release v1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
petkaantonov committed Mar 31, 2014
1 parent cdca354 commit 2f07b52
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
13 changes: 12 additions & 1 deletion browser/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -4873,7 +4873,6 @@ Promise.prototype.nodeify = function Promise$nodeify(nodeback) {
nodeback,
this._isBound() ? this._boundTo : null
);
return;
}
return this;
};
Expand Down Expand Up @@ -25845,6 +25844,18 @@ if( isNodeJS ) {
done();
});
});

it("always returns promise for now", function(done){
Promise.resolve(3).nodeify().then(function() {
var a = 0;
Promise.resolve(3).nodeify(function(){
a++;
}).then(function(){
assert(1 == 1);
done();
});
})
});
});
}

Expand Down
3 changes: 1 addition & 2 deletions js/browser/bluebird.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* bluebird build version 1.2.0
* bluebird build version 1.2.1
* Features enabled: core, timers, race, any, call_get, filter, generators, map, nodeify, promisify, props, reduce, settle, some, progress, cancel
*/
/**
Expand Down Expand Up @@ -1513,7 +1513,6 @@ Promise.prototype.nodeify = function Promise$nodeify(nodeback) {
nodeback,
this._isBound() ? this._boundTo : null
);
return;
}
return this;
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bluebird",
"description": "Full featured Promises/A+ implementation with exceptionally good performance",
"version": "1.2.0",
"version": "1.2.1",
"keywords": [
"promise",
"performance",
Expand Down

0 comments on commit 2f07b52

Please sign in to comment.