diff options
| author | Chris Rebert <[email protected]> | 2014-06-17 23:35:22 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-06-17 23:35:22 -0700 |
| commit | 1c42dfcd532867acd1488de0d91edd71a6a19aea (patch) | |
| tree | 8ab62efe13b461aa7a0c966030cec67401e7141b /dist | |
| parent | 4f95989c386a3ffd826c063909ec70d54443c944 (diff) | |
| parent | f347d7d955bbb17234b8e12c68efae7d516ce62c (diff) | |
| download | bootstrap-1c42dfcd532867acd1488de0d91edd71a6a19aea.tar.xz bootstrap-1c42dfcd532867acd1488de0d91edd71a6a19aea.zip | |
Merge pull request #13842 from twbs/fix-13811
update "is jQuery defined" check for UMD compatibility
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/js/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index f998f65af..b90519a24 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -4,7 +4,7 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') } +if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQuery == 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') } /* ======================================================================== * Bootstrap: transition.js v3.1.1 |