Merge branch 'twbs/v4-dev' into dropdown-keyboard

1 files changed, 12 insertions, 12 deletions

diff --git a/js/src/alert.js b/js/src/alert.js
index 4cb006ea3..884a5dec8 100644
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -3,7 +3,7 @@ import Util from './util'
 
 /**
  * --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-alpha.2): alert.js
+ * Bootstrap (v4.0.0-alpha.5): alert.js
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@ const Alert = (($) => {
    */
 
   const NAME                = 'alert'
-  const VERSION             = '4.0.0-alpha.2'
+  const VERSION             = '4.0.0-alpha.5'
   const DATA_KEY            = 'bs.alert'
   const EVENT_KEY           = `.${DATA_KEY}`
   const DATA_API_KEY        = '.data-api'
@@ -38,7 +38,7 @@ const Alert = (($) => {
   const ClassName = {
     ALERT : 'alert',
     FADE  : 'fade',
-    IN    : 'in'
+    SHOW  : 'show'
   }
 
 
@@ -67,8 +67,8 @@ const Alert = (($) => {
     close(element) {
       element = element || this._element
 
-      let rootElement = this._getRootElement(element)
-      let customEvent = this._triggerCloseEvent(rootElement)
+      const rootElement = this._getRootElement(element)
+      const customEvent = this._triggerCloseEvent(rootElement)
 
       if (customEvent.isDefaultPrevented()) {
         return
@@ -86,8 +86,8 @@ const Alert = (($) => {
     // private
 
     _getRootElement(element) {
-      let selector = Util.getSelectorFromElement(element)
-      let parent   = false
+      const selector = Util.getSelectorFromElement(element)
+      let parent     = false
 
       if (selector) {
         parent = $(selector)[0]
@@ -101,14 +101,14 @@ const Alert = (($) => {
     }
 
     _triggerCloseEvent(element) {
-      let closeEvent = $.Event(Event.CLOSE)
+      const closeEvent = $.Event(Event.CLOSE)
 
       $(element).trigger(closeEvent)
       return closeEvent
     }
 
     _removeElement(element) {
-      $(element).removeClass(ClassName.IN)
+      $(element).removeClass(ClassName.SHOW)
 
       if (!Util.supportsTransitionEnd() ||
           !$(element).hasClass(ClassName.FADE)) {
@@ -117,7 +117,7 @@ const Alert = (($) => {
       }
 
       $(element)
-        .one(Util.TRANSITION_END, $.proxy(this._destroyElement, this, element))
+        .one(Util.TRANSITION_END, (event) => this._destroyElement(element, event))
         .emulateTransitionEnd(TRANSITION_DURATION)
     }
 
@@ -133,8 +133,8 @@ const Alert = (($) => {
 
     static _jQueryInterface(config) {
       return this.each(function () {
-        let $element = $(this)
-        let data     = $element.data(DATA_KEY)
+        const $element = $(this)
+        let data       = $element.data(DATA_KEY)
 
         if (!data) {
           data = new Alert(this)