diff options
author | Caolan McMahon <caolan.mcmahon@gmail.com> | 2014-03-28 12:45:59 +0000 |
---|---|---|
committer | Caolan McMahon <caolan.mcmahon@gmail.com> | 2014-03-28 12:45:59 +0000 |
commit | 39e1e657ed1632c6e7c3c7a0a77118ef41e90c08 (patch) | |
tree | a103660019e91277f8c448a207ea7e983b6b22ce | |
parent | 191a5076bf4a9cb6ac87b1bf6e9d4eb0a13527d7 (diff) | |
parent | db06259ab373e669059ae126c4403cf0e6f9af52 (diff) | |
download | async-39e1e657ed1632c6e7c3c7a0a77118ef41e90c08.tar.gz |
Merge pull request #421 from DECK36/master
Changed the order of exporting async for using browserify to create apps beside requireJS using apps
-rwxr-xr-x | lib/async.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/async.js b/lib/async.js index 16240f8..922ea44 100755 --- a/lib/async.js +++ b/lib/async.js @@ -951,16 +951,16 @@ next(); }; + // Node.js + if (typeof module !== 'undefined' && module.exports) { + module.exports = async; + } // AMD / RequireJS - if (typeof define !== 'undefined' && define.amd) { + else if (typeof define !== 'undefined' && define.amd) { define([], function () { return async; }); } - // Node.js - else if (typeof module !== 'undefined' && module.exports) { - module.exports = async; - } // included directly via <script> tag else { root.async = async; |