From 8ff368eadd3ac3e555b91f16b20fda94646cda48 Mon Sep 17 00:00:00 2001
From: Julien Ducro <julien.ducro@deskpro.com>
Date: Thu, 22 Jun 2017 16:17:54 +0100
Subject: [PATCH 1/2] Fix bootstrap error

---
 dist/index.js | 25 +++++++++++++++++--------
 lib/index.js  | 18 +++++++++++-------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 420d967..ed49bd7 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -11,25 +11,34 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var $;
-if (typeof window !== 'undefined' && window && window.jQuery) {
-	$ = window.jQuery;
+if (typeof window !== 'undefined' && window) {
+	if (window.jQuery) {
+		$ = window.jQuery;
+	} else {
+		$ = require('jquery');
+		window.jQuery = $;
+	}
 } else {
 	$ = require('jquery');
-	window.jQuery = $;
 }
 
-var BS = require('bootstrap');
 var React = require('react');
 var objectAssign = require('object-assign');
 var getOptions = require('./get-options.js');
 var bsMultiselect = require('./bootstrap-multiselect.js');
 var bsDropdown;
-
+var BS;
 // make it play nice when we already have bootstrap dropdown loaded.
-if (typeof BS === 'undefined' || typeof BS.dropdown === 'undefined') {
+try {
+	BS = require('bootstrap');
+	if (typeof BS.dropdown !== 'undefined') {
+		bsDropdown = BS.dropdown;
+	}
+} catch (e) {
+	console.log('No bootstap');
+}
+if (!bsDropdown) {
 	bsDropdown = require('./bootstrap-dropdown.js');
-} else {
-	bsDropdown = BS.dropdown;
 }
 
 $ = bsDropdown.init($);
diff --git a/lib/index.js b/lib/index.js
index 9bd4f2c..a4f982d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -6,26 +6,30 @@ if (typeof window !== 'undefined' && window) {
 	if (window.jQuery) {
 	  $ = window.jQuery;
 	} else {
-		$ = require('jquery')
+		$ = require('jquery');
 		window.jQuery = $;
 	}
 } else {
   $ = require('jquery');
 }
 
-var BS = require('bootstrap');
 var React = require('react');
 var objectAssign = require('object-assign');
 var getOptions = require('./get-options.js');
 var bsMultiselect = require('./bootstrap-multiselect.js');
 var bsDropdown;
-
+var BS;
 // make it play nice when we already have bootstrap dropdown loaded.
-if (typeof BS === 'undefined' || typeof BS.dropdown === 'undefined') {
-	bsDropdown = require('./bootstrap-dropdown.js');
+try {
+	BS = require('bootstrap');
+	if (typeof BS.dropdown !== 'undefined') {
+    bsDropdown = BS.dropdown;
+	}
+} catch (e) {
+	console.log('No bootstap');
 }
-else {
-	bsDropdown = BS.dropdown;
+if (!bsDropdown) {
+	bsDropdown = require('./bootstrap-dropdown.js');
 }
 
 $ = bsDropdown.init($);

From 3534f5973c6c96783ff46af48e4eca4c5d468b91 Mon Sep 17 00:00:00 2001
From: Julien Ducro <julien.ducro@deskpro.com>
Date: Thu, 22 Jun 2017 18:05:53 +0100
Subject: [PATCH 2/2] Review fixes

---
 dist/index.js | 8 +++-----
 lib/index.js  | 5 ++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index ed49bd7..c0e92b4 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -27,16 +27,14 @@ var objectAssign = require('object-assign');
 var getOptions = require('./get-options.js');
 var bsMultiselect = require('./bootstrap-multiselect.js');
 var bsDropdown;
-var BS;
+
 // make it play nice when we already have bootstrap dropdown loaded.
 try {
-	BS = require('bootstrap');
+	var BS = require('bootstrap');
 	if (typeof BS.dropdown !== 'undefined') {
 		bsDropdown = BS.dropdown;
 	}
-} catch (e) {
-	console.log('No bootstap');
-}
+} catch (e) {}
 if (!bsDropdown) {
 	bsDropdown = require('./bootstrap-dropdown.js');
 }
diff --git a/lib/index.js b/lib/index.js
index a4f982d..1751be2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -18,15 +18,14 @@ var objectAssign = require('object-assign');
 var getOptions = require('./get-options.js');
 var bsMultiselect = require('./bootstrap-multiselect.js');
 var bsDropdown;
-var BS;
+
 // make it play nice when we already have bootstrap dropdown loaded.
 try {
-	BS = require('bootstrap');
+	var BS = require('bootstrap');
 	if (typeof BS.dropdown !== 'undefined') {
     bsDropdown = BS.dropdown;
 	}
 } catch (e) {
-	console.log('No bootstap');
 }
 if (!bsDropdown) {
 	bsDropdown = require('./bootstrap-dropdown.js');