Merge branch 'v4-dev' into btn_input_split_variables

12 files changed, 29 insertions, 25 deletions

diff --git a/js/src/alert.js b/js/src/alert.js
index 9d6c498b9..420aa84a3 100644
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -4,7 +4,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): alert.js
+ * Bootstrap (v4.0.0-beta.2): alert.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ const Alert = (() => {
    */
 
   const NAME                = 'alert'
-  const VERSION             = '4.0.0-beta'
+  const VERSION             = '4.0.0-beta.2'
   const DATA_KEY            = 'bs.alert'
   const EVENT_KEY           = `.${DATA_KEY}`
   const DATA_API_KEY        = '.data-api'
diff --git a/js/src/button.js b/js/src/button.js
index 7bf5e87dd..9227da951 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -1,7 +1,7 @@
 import $ from 'jquery'
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): button.js
+ * Bootstrap (v4.0.0-beta.2): button.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@ const Button = (() => {
    */
 
   const NAME                = 'button'
-  const VERSION             = '4.0.0-beta'
+  const VERSION             = '4.0.0-beta.2'
   const DATA_KEY            = 'bs.button'
   const EVENT_KEY           = `.${DATA_KEY}`
   const DATA_API_KEY        = '.data-api'
diff --git a/js/src/carousel.js b/js/src/carousel.js
index 3a6d7a4bc..964f7fda6 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -4,7 +4,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): carousel.js
+ * Bootstrap (v4.0.0-beta.2): carousel.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ const Carousel = (() => {
    */
 
   const NAME                   = 'carousel'
-  const VERSION                = '4.0.0-beta'
+  const VERSION                = '4.0.0-beta.2'
   const DATA_KEY               = 'bs.carousel'
   const EVENT_KEY              = `.${DATA_KEY}`
   const DATA_API_KEY           = '.data-api'
diff --git a/js/src/collapse.js b/js/src/collapse.js
index d29e48722..8e84d7b59 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -4,7 +4,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): collapse.js
+ * Bootstrap (v4.0.0-beta.2): collapse.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ const Collapse = (() => {
    */
 
   const NAME                = 'collapse'
-  const VERSION             = '4.0.0-beta'
+  const VERSION             = '4.0.0-beta.2'
   const DATA_KEY            = 'bs.collapse'
   const EVENT_KEY           = `.${DATA_KEY}`
   const DATA_API_KEY        = '.data-api'
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 3a910996b..8fdddd689 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -5,7 +5,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): dropdown.js
+ * Bootstrap (v4.0.0-beta.2): dropdown.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@ const Dropdown = (() => {
    */
 
   const NAME                     = 'dropdown'
-  const VERSION                  = '4.0.0-beta'
+  const VERSION                  = '4.0.0-beta.2'
   const DATA_KEY                 = 'bs.dropdown'
   const EVENT_KEY                = `.${DATA_KEY}`
   const DATA_API_KEY             = '.data-api'
diff --git a/js/src/index.js b/js/src/index.js
index 2629e507f..f30b94c57 100644
--- a/js/src/index.js
+++ b/js/src/index.js
@@ -24,10 +24,14 @@ import Util from './util'
   }
 
   const version = $.fn.jquery.split(' ')[0].split('.')
-  const min = 3
-  const max = 4
-  if (version[0] < min || version[0] >= max) {
-    throw new Error('Bootstrap\'s JavaScript requires at least jQuery v3.0.0 but less than v4.0.0')
+  const minMajor = 1
+  const ltMajor  = 2
+  const minMinor = 9
+  const minPatch = 1
+  const maxMajor = 4
+
+  if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
+    throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
   }
 })($)
 
diff --git a/js/src/modal.js b/js/src/modal.js
index 399adc4c1..07fdc9f4f 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -4,7 +4,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): modal.js
+ * Bootstrap (v4.0.0-beta.2): modal.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ const Modal = (() => {
    */
 
   const NAME                         = 'modal'
-  const VERSION                      = '4.0.0-beta'
+  const VERSION                      = '4.0.0-beta.2'
   const DATA_KEY                     = 'bs.modal'
   const EVENT_KEY                    = `.${DATA_KEY}`
   const DATA_API_KEY                 = '.data-api'
diff --git a/js/src/popover.js b/js/src/popover.js
index 89c78f4fe..ff697d85a 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -4,7 +4,7 @@ import Tooltip from './tooltip'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): popover.js
+ * Bootstrap (v4.0.0-beta.2): popover.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ const Popover = (() => {
    */
 
   const NAME                = 'popover'
-  const VERSION             = '4.0.0-beta'
+  const VERSION             = '4.0.0-beta.2'
   const DATA_KEY            = 'bs.popover'
   const EVENT_KEY           = `.${DATA_KEY}`
   const JQUERY_NO_CONFLICT  = $.fn[NAME]
diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js
index c844bd530..a0e24dd22 100644
--- a/js/src/scrollspy.js
+++ b/js/src/scrollspy.js
@@ -4,7 +4,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): scrollspy.js
+ * Bootstrap (v4.0.0-beta.2): scrollspy.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ const ScrollSpy = (() => {
    */
 
   const NAME               = 'scrollspy'
-  const VERSION            = '4.0.0-beta'
+  const VERSION            = '4.0.0-beta.2'
   const DATA_KEY           = 'bs.scrollspy'
   const EVENT_KEY          = `.${DATA_KEY}`
   const DATA_API_KEY       = '.data-api'
diff --git a/js/src/tab.js b/js/src/tab.js
index 17699dfbe..982121cc0 100644
--- a/js/src/tab.js
+++ b/js/src/tab.js
@@ -4,7 +4,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): tab.js
+ * Bootstrap (v4.0.0-beta.2): tab.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@ const Tab = (() => {
    */
 
   const NAME                = 'tab'
-  const VERSION             = '4.0.0-beta'
+  const VERSION             = '4.0.0-beta.2'
   const DATA_KEY            = 'bs.tab'
   const EVENT_KEY           = `.${DATA_KEY}`
   const DATA_API_KEY        = '.data-api'
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 8d262f4ad..ee721a19d 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -5,7 +5,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): tooltip.js
+ * Bootstrap (v4.0.0-beta.2): tooltip.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -28,7 +28,7 @@ const Tooltip = (() => {
    */
 
   const NAME                = 'tooltip'
-  const VERSION             = '4.0.0-beta'
+  const VERSION             = '4.0.0-beta.2'
   const DATA_KEY            = 'bs.tooltip'
   const EVENT_KEY           = `.${DATA_KEY}`
   const JQUERY_NO_CONFLICT  = $.fn[NAME]
diff --git a/js/src/util.js b/js/src/util.js
index a75660014..16d114b1a 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -2,7 +2,7 @@ import $ from 'jquery'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-beta): util.js
+ * Bootstrap (v4.0.0-beta.2): util.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */