Skip to content

Commit

Permalink
Bluebird.noConflict messes up with root.Promise
Browse files Browse the repository at this point in the history
  • Loading branch information
pocesar committed Apr 25, 2016
1 parent 1d858bd commit 6e08141
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/chain-commander.js
Expand Up @@ -9,10 +9,10 @@
root.define(['bluebird'], definition);
} else {
/* <script> */
if (typeof root.Promise === 'undefined') {
if (typeof root.P === 'undefined') {
throw new Error('bluebird library is missing');
}
root.ChainCommander = definition(root.Promise);
root.ChainCommander = definition(root.P);
}

})(this, function (Q) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "chain-commander",
"version": "2.0.1",
"version": "3.0.0",
"main": "./lib/chain-commander.js",
"browser": "./lib/chain-commander.js",
"description": "Chain commander is a library based on Bluebird promise library, to encapsulate business rules logic in form of javascript objects or JSON.",
Expand Down

0 comments on commit 6e08141

Please sign in to comment.