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

12 files changed, 13 insertions, 14 deletions

diff --git a/js/src/alert.js b/js/src/alert.js
index 420aa84a3..8d52e1591 100644
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Alert = (() => {
+const Alert = (($) => {
 
 
   /**
diff --git a/js/src/button.js b/js/src/button.js
index 9227da951..5632998a3 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -1,4 +1,5 @@
 import $ from 'jquery'
+
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.0.0-beta.2): button.js
@@ -6,7 +7,7 @@ import $ from 'jquery'
  * --------------------------------------------------------------------------
  */
 
-const Button = (() => {
+const Button = (($) => {
 
 
   /**
diff --git a/js/src/carousel.js b/js/src/carousel.js
index 964f7fda6..10ed2203e 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Carousel = (() => {
+const Carousel = (($) => {
 
 
   /**
diff --git a/js/src/collapse.js b/js/src/collapse.js
index 8e84d7b59..f907aec54 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Collapse = (() => {
+const Collapse = (($) => {
 
 
   /**
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 8fdddd689..e3331ac18 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -10,7 +10,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Dropdown = (() => {
+const Dropdown = (($) => {
 
   /**
    * Check for Popper dependency
diff --git a/js/src/index.js b/js/src/index.js
index f30b94c57..51d09b4e2 100644
--- a/js/src/index.js
+++ b/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.')
   }
diff --git a/js/src/modal.js b/js/src/modal.js
index 07fdc9f4f..95565aabc 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Modal = (() => {
+const Modal = (($) => {
 
 
   /**
diff --git a/js/src/popover.js b/js/src/popover.js
index ff697d85a..4fb96a792 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -9,7 +9,7 @@ import Tooltip from './tooltip'
  * --------------------------------------------------------------------------
  */
 
-const Popover = (() => {
+const Popover = (($) => {
 
 
   /**
diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js
index a0e24dd22..3a13d954a 100644
--- a/js/src/scrollspy.js
+++ b/js/src/scrollspy.js
@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const ScrollSpy = (() => {
+const ScrollSpy = (($) => {
 
 
   /**
diff --git a/js/src/tab.js b/js/src/tab.js
index 982121cc0..1d4178687 100644
--- a/js/src/tab.js
+++ b/js/src/tab.js
@@ -9,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Tab = (() => {
+const Tab = (($) => {
 
 
   /**
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index ee721a19d..a3fc93c91 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -10,7 +10,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Tooltip = (() => {
+const Tooltip = (($) => {
 
   /**
    * Check for Popper dependency
diff --git a/js/src/util.js b/js/src/util.js
index 16d114b1a..71f93a7c5 100644
--- a/js/src/util.js
+++ b/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'
   }