Merge pull request #1814 from pavel-mironchik/bootstrap-jquery
Do not include jQuery twice.
This commit is contained in:
4
resources/assets/js/bootstrap.js
vendored
4
resources/assets/js/bootstrap.js
vendored
@ -8,7 +8,9 @@ window._ = require('lodash');
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
try {
|
try {
|
||||||
window.$ = window.jQuery = require('jquery');
|
if (!window.$) {
|
||||||
|
window.$ = window.jQuery = require('jquery');
|
||||||
|
}
|
||||||
|
|
||||||
//require('bootstrap-sass');
|
//require('bootstrap-sass');
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
|
Reference in New Issue
Block a user