1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 00:54:04 +02:00
This commit is contained in:
Mark Otto
2016-10-31 21:36:10 -07:00
parent ffaad0a819
commit cd5c7a2263
22 changed files with 810 additions and 216 deletions

14
js/dist/alert.js vendored
View File

@@ -4,7 +4,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha.4): 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 @@ var Alert = function ($) {
*/
var NAME = 'alert';
var VERSION = '4.0.0-alpha.4';
var VERSION = '4.0.0-alpha.5';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = '.' + DATA_KEY;
var DATA_API_KEY = '.data-api';
@@ -38,7 +38,7 @@ var Alert = function ($) {
var ClassName = {
ALERT: 'alert',
FADE: 'fade',
IN: 'in'
ACTIVE: 'active'
};
/**
@@ -101,14 +101,18 @@ var Alert = function ($) {
};
Alert.prototype._removeElement = function _removeElement(element) {
$(element).removeClass(ClassName.IN);
var _this = this;
$(element).removeClass(ClassName.ACTIVE);
if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) {
this._destroyElement(element);
return;
}
$(element).one(Util.TRANSITION_END, $.proxy(this._destroyElement, this, element)).emulateTransitionEnd(TRANSITION_DURATION);
$(element).one(Util.TRANSITION_END, function (event) {
return _this._destroyElement(element, event);
}).emulateTransitionEnd(TRANSITION_DURATION);
};
Alert.prototype._destroyElement = function _destroyElement(element) {

File diff suppressed because one or more lines are too long