Skip to content

Commit b2d01d2

Browse files
authored
Merge pull request #61 from rosselliott/master
Play nicely when bootstrap dropdown is already loaded.
2 parents 0f72727 + 9b6cb47 commit b2d01d2

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

lib/index.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
'use strict';
22

3-
var React = require('react');
4-
var objectAssign = require('object-assign');
5-
var getOptions = require('./get-options.js');
6-
var bsMultiselect = require('./bootstrap-multiselect.js');
7-
var bsDropdown = require('./bootstrap-dropdown.js');
83
// setup jQuery
94
var $;
105
if (typeof window !== 'undefined' && window && window.jQuery) {
116
$ = window.jQuery;
127
} else {
138
$ = require('jquery');
149
}
10+
11+
var BS = require('bootstrap');
12+
var React = require('react');
13+
var objectAssign = require('object-assign');
14+
var getOptions = require('./get-options.js');
15+
var bsMultiselect = require('./bootstrap-multiselect.js');
16+
var bsDropdown;
17+
18+
// make it play nice when we already have bootstrap dropdown loaded.
19+
if (typeof BS === 'undefined' || typeof BS.dropdown === 'undefined') {
20+
bsDropdown = require('./bootstrap-dropdown.js');
21+
}
22+
else {
23+
bsDropdown = BS.dropdown;
24+
}
25+
1526
$ = bsDropdown.init($);
1627
$ = bsMultiselect.init($);
1728

0 commit comments

Comments
 (0)