Merge branch 'v4-dev' into malkomich-v4-dev

fb2de043 · Mark Otto · c6abb8ca · e3b98c51 · fb2de043 · fb2de043
Commit fb2de043 authored 6 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 40 additions and 97 deletions
+40 -97
--- a/js/dist/util.js.map
+++ b/js/dist/util.js.map
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -3,7 +3,7 @@ import Util from './util'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): alert.js
+ * Bootstrap (v4.1.3): alert.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */
@@ -16,7 +16,7 @@ const Alert = (($) => {
   */

  const NAME                = 'alert'
-  const VERSION             = '4.1.1'
+  const VERSION             = '4.1.3'
  const DATA_KEY            = 'bs.alert'
  const EVENT_KEY           = `.${DATA_KEY}`
  const DATA_API_KEY        = '.data-api'

--- a/js/src/button.js
+++ b/js/src/button.js
@@ -2,7 +2,7 @@ import $ from 'jquery'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): button.js
+ * Bootstrap (v4.1.3): button.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */
@@ -15,7 +15,7 @@ const Button = (($) => {
   */

  const NAME                = 'button'
-  const VERSION             = '4.1.1'
+  const VERSION             = '4.1.3'
  const DATA_KEY            = 'bs.button'
  const EVENT_KEY           = `.${DATA_KEY}`
  const DATA_API_KEY        = '.data-api'

--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -3,7 +3,7 @@ import Util from './util'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): carousel.js
+ * Bootstrap (v4.1.3): carousel.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */
@@ -16,7 +16,7 @@ const Carousel = (($) => {
   */

  const NAME                   = 'carousel'
-  const VERSION                = '4.1.1'
+  const VERSION                = '4.1.3'
  const DATA_KEY               = 'bs.carousel'
  const EVENT_KEY              = `.${DATA_KEY}`
  const DATA_API_KEY           = '.data-api'

--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -3,7 +3,7 @@ import Util from './util'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): collapse.js
+ * Bootstrap (v4.1.3): collapse.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */
@@ -16,7 +16,7 @@ const Collapse = (($) => {
   */

  const NAME                = 'collapse'
-  const VERSION             = '4.1.1'
+  const VERSION             = '4.1.3'
  const DATA_KEY            = 'bs.collapse'
  const EVENT_KEY           = `.${DATA_KEY}`
  const DATA_API_KEY        = '.data-api'

--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -4,7 +4,7 @@ import Util from './util'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): dropdown.js
+ * Bootstrap (v4.1.3): dropdown.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */
@@ -17,7 +17,7 @@ const Dropdown = (($) => {
   */

  const NAME                     = 'dropdown'
-  const VERSION                  = '4.1.1'
+  const VERSION                  = '4.1.3'
  const DATA_KEY                 = 'bs.dropdown'
  const EVENT_KEY                = `.${DATA_KEY}`
  const DATA_API_KEY             = '.data-api'

--- a/js/src/index.js
+++ b/js/src/index.js
@@ -13,7 +13,7 @@ import Util from './util'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): index.js
+ * Bootstrap (v4.1.3): index.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */

--- a/js/src/modal.js
+++ b/js/src/modal.js
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -3,7 +3,7 @@ import Tooltip from './tooltip'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): popover.js
+ * Bootstrap (v4.1.3): popover.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */
@@ -16,7 +16,7 @@ const Popover = (($) => {
   */

  const NAME                = 'popover'
-  const VERSION             = '4.1.1'
+  const VERSION             = '4.1.3'
  const DATA_KEY            = 'bs.popover'
  const EVENT_KEY           = `.${DATA_KEY}`
  const JQUERY_NO_CONFLICT  = $.fn[NAME]

--- a/js/src/scrollspy.js
+++ b/js/src/scrollspy.js
@@ -3,7 +3,7 @@ import Util from './util'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): scrollspy.js
+ * Bootstrap (v4.1.3): scrollspy.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */
@@ -16,7 +16,7 @@ const ScrollSpy = (($) => {
   */

  const NAME               = 'scrollspy'
-  const VERSION            = '4.1.1'
+  const VERSION            = '4.1.3'
  const DATA_KEY           = 'bs.scrollspy'
  const EVENT_KEY          = `.${DATA_KEY}`
  const DATA_API_KEY       = '.data-api'

--- a/js/src/tab.js
+++ b/js/src/tab.js
@@ -3,7 +3,7 @@ import Util from './util'

 /**
 * --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): tab.js
+ * Bootstrap (v4.1.3): tab.js
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * --------------------------------------------------------------------------
 */
@@ -16,7 +16,7 @@ const Tab = (($) => {
   */

  const NAME               = 'tab'
-  const VERSION            = '4.1.1'
+  const VERSION            = '4.1.3'
  const DATA_KEY           = 'bs.tab'
  const EVENT_KEY          = `.${DATA_KEY}`
  const DATA_API_KEY       = '.data-api'

--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
--- a/js/src/util.js
+++ b/js/src/util.js
--- a/js/tests/index.html
+++ b/js/tests/index.html
--- a/js/tests/karma-bundle.conf.js
+++ b/js/tests/karma-bundle.conf.js
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
--- a/js/tests/visual/alert.html
+++ b/js/tests/visual/alert.html
--- a/js/tests/visual/button.html
+++ b/js/tests/visual/button.html
--- a/js/tests/visual/carousel.html
+++ b/js/tests/visual/carousel.html