diff --git a/Gruntfile.js b/Gruntfile.js index d7863315679444b831416f89f95863d1513b5284..922daf5e4d919c1cb6f9e46ac547f5e7d9a76d79 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -33,7 +33,7 @@ module.exports = function (grunt) { ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' + ' */\n', // NOTE: This jqueryCheck code is duplicated in customizer.js; if making changes here, be sure to update the other copy too. - jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n', + jqueryCheck: 'if (typeof define == \'undefined\' && typeof exports == \'undefined\' && typeof jQuery == \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n', // Task configuration. clean: { diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index f998f65af56eba099ab58d720d5ba1ba9c6137e8..b90519a24fb0517cdd63a042bc5a81f3e209577f 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 diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/_src/customizer.js index 4fc3c7cbc7fbec452db177ec30d9fed021bbd526..aec869797de5cbc95e23032ad1066cd97b78289f 100644 --- a/docs/assets/js/_src/customizer.js +++ b/docs/assets/js/_src/customizer.js @@ -306,7 +306,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 function generateJS(preamble) { var $checked = $('#plugin-section input:checked') - var jqueryCheck = 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap\'s JavaScript requires jQuery") }\n\n' + var jqueryCheck = 'if (typeof define == \'undefined\' && typeof exports == \'undefined\' && typeof jQuery == \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n' if (!$checked.length) return false