Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

_config.yml

@@ -71,5 +71,5 @@ cdn:
   js_hash:          "sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ"
   jquery:           "https://code.jquery.com/jquery-3.2.1.slim.min.js"
   jquery_hash:      "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
-  popper:           "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"
-  popper_hash:      "sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh"
+  popper:           "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.6/umd/popper.min.js"
+  popper_hash:      "sha384-W1IgCZfiFCplncoIxD5rld+uzdB6FlcG2vm4qjrCP5Z7uUt7vnwbztJXeqXgd26w"

build/rollup.config.js

@@ -20,7 +20,7 @@ const plugins = [
   })
 ]
 const globals = {
-  jquery: '$',
+  jquery: 'jQuery', // ensure we use jQuery which is always available even in noConflict mode
   'popper.js': 'Popper'
 }
 

docs/4.0/migration.md

@@ -231,6 +231,7 @@ Dropped entirely for the new card component.
 ### Progress
 
 - Replaced contextual `.progress-bar-*` classes with `.bg-*` utilities. For example, `class="progress-bar progress-bar-danger"` becomes `class="progress-bar bg-danger"`.
+- Replaced `.active` for animated progress bars with `.progress-bar-animated`.
 
 ### Carousel
 

js/src/alert.js

@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Alert = (() => {
+const Alert = (($) => {
 
 
   /**

js/src/button.js

 import $ from 'jquery'
+
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.0.0-beta.2): button.js
@@ -6,7 +7,7 @@ import $ from 'jquery'
  * --------------------------------------------------------------------------
  */
 
-const Button = (() => {
+const Button = (($) => {
 
 
   /**

js/src/carousel.js

@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Carousel = (() => {
+const Carousel = (($) => {
 
 
   /**

js/src/collapse.js

@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Collapse = (() => {
+const Collapse = (($) => {
 
 
   /**

js/src/dropdown.js

@@ -10,7 +10,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Dropdown = (() => {
+const Dropdown = (($) => {
 
   /**
    * Check for Popper dependency

js/src/index.js

@@ -18,7 +18,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-(() => {
+(($) => {
   if (typeof $ === 'undefined') {
     throw new Error('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.')
   }

js/src/modal.js

@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Modal = (() => {
+const Modal = (($) => {
 
 
   /**

js/src/popover.js

@@ -9,7 +9,7 @@ import Tooltip from './tooltip'
  * --------------------------------------------------------------------------
  */
 
-const Popover = (() => {
+const Popover = (($) => {
 
 
   /**

js/src/scrollspy.js

@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const ScrollSpy = (() => {
+const ScrollSpy = (($) => {
 
 
   /**

js/src/tab.js

@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Tab = (() => {
+const Tab = (($) => {
 
 
   /**

js/src/tooltip.js

@@ -10,7 +10,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Tooltip = (() => {
+const Tooltip = (($) => {
 
   /**
    * Check for Popper dependency

js/src/util.js

@@ -7,7 +7,7 @@ import $ from 'jquery'
  * --------------------------------------------------------------------------
  */
 
-const Util = (() => {
+const Util = (($) => {
 
 
   /**
@@ -22,8 +22,6 @@ const Util = (() => {
 
   const TransitionEndEvent = {
     WebkitTransition : 'webkitTransitionEnd',
-    MozTransition    : 'transitionend',
-    OTransition      : 'oTransitionEnd otransitionend',
     transition       : 'transitionend'
   }
 

js/tests/index.html

@@ -119,6 +119,7 @@
     <script src="unit/tab.js"></script>
     <script src="unit/tooltip.js"></script>
     <script src="unit/popover.js"></script>
+    <script src="unit/util.js"></script>
   </head>
   <body>
     <div id="qunit-container">

js/tests/unit/util.js

+$(function () {
+  'use strict'
+
+  QUnit.module('util')
+
+  QUnit.test('Util.getSelectorFromElement should return the correct element', function (assert) {
+    assert.expect(2)
+    var $el = $('<div data-target="body"></div>').appendTo($('#qunit-fixture'))
+    assert.strictEqual(Util.getSelectorFromElement($el[0]), 'body')
+
+    // not found element
+    var $el2 = $('<div data-target="#fakeDiv"></div>').appendTo($('#qunit-fixture'))
+    assert.strictEqual(Util.getSelectorFromElement($el2[0]), null)
+  })
+
+  QUnit.test('Util.typeCheckConfig should thrown an error when a bad config is passed', function (assert) {
+    assert.expect(1)
+    var namePlugin = 'collapse'
+    var defaultType = {
+      toggle : 'boolean',
+      parent : '(string|element)'
+    }
+    var config = {
+      toggle: true,
+      parent: 777
+    }
+
+    try {
+      Util.typeCheckConfig(namePlugin, config, defaultType)
+    } catch (e) {
+      assert.strictEqual(e.message, 'COLLAPSE: Option "parent" provided type "number" but expected type "(string|element)".')
+    }
+  })
+
+  QUnit.test('Util.isElement should check if we passed an element or not', function (assert) {
+    assert.expect(3)
+    var $div = $('<div id="test"></div>').appendTo($('#qunit-fixture'))
+
+    assert.strictEqual(Util.isElement($div), 1)
+    assert.strictEqual(Util.isElement($div[0]), 1)
+    assert.strictEqual(typeof Util.isElement({}) === 'undefined', true)
+  })
+
+  QUnit.test('Util.getUID should generate a new id uniq', function (assert) {
+    assert.expect(2)
+    var id = Util.getUID('test')
+    var id2 = Util.getUID('test')
+
+    assert.ok(id !== id2, id + ' !== ' + id2)
+
+    id = Util.getUID('test')
+    $('<div id="' + id + '"></div>').appendTo($('#qunit-fixture'))
+
+    id2 = Util.getUID('test')
+    assert.ok(id !== id2, id + ' !== ' + id2)
+  })
+})

nuget/bootstrap.nuspec

@@ -17,7 +17,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <dependency id="jQuery" version="[3.0.0,4)" />
-      <dependency id="popper.js" version="[1.12.3,2)" />
+      <dependency id="popper.js" version="[1.12.6,2)" />
     </dependencies>
     <tags>css mobile-first responsive front-end framework web</tags>
   </metadata>

nuget/bootstrap.sass.nuspec

@@ -17,7 +17,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <dependency id="jQuery" version="[3.0.0,4)" />
-      <dependency id="popper.js" version="[1.12.3,2)" />
+      <dependency id="popper.js" version="[1.12.6,2)" />
     </dependencies>
     <tags>css sass mobile-first responsive front-end framework web</tags>
   </metadata>