diff options
| author | Sam Potts <sam@selz.com> | 2016-01-27 08:45:10 +1100 |
|---|---|---|
| committer | Sam Potts <sam@selz.com> | 2016-01-27 08:45:10 +1100 |
| commit | b8b611fbb61be016ab23d1a71225f1baf2df0a91 (patch) | |
| tree | 4dfea04fe2a5c0f771972436dc5d39fa99d35e39 /src/js | |
| parent | 01bdcc2b01c87119a6f2a36c3260cf0e7c55ba9a (diff) | |
| parent | a285fcc4ec45816d43fa3bfe35c23dd21e7bfc63 (diff) | |
| download | plyr-b8b611fbb61be016ab23d1a71225f1baf2df0a91.tar.lz plyr-b8b611fbb61be016ab23d1a71225f1baf2df0a91.tar.xz plyr-b8b611fbb61be016ab23d1a71225f1baf2df0a91.zip | |
Merge pull request #152 from marvinhagemeister/fix_commonjs
Swap CommonJS and AMD module check so that CommonJS is checked first
Diffstat (limited to 'src/js')
| -rw-r--r-- | src/js/plyr.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index ac6c7d20..76623068 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -11,12 +11,12 @@ 'use strict'; /*global define,module*/ - if (typeof define === 'function' && define.amd) { - // AMD - define(null, function() { factory(root, document) }); - } else if (typeof module === 'object') { + if (typeof module === 'object' && typeof module.exports === 'object') { // Node, CommonJS-like module.exports = factory(root, document); + } else if (typeof define === 'function' && define.amd) { + // AMD + define(null, function() { factory(root, document) }); } else { // Browser globals (root is window) root.plyr = factory(root, document); |