Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'js/dist/alert.js')
-rw-r--r--js/dist/alert.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/dist/alert.js b/js/dist/alert.js
index dd7c6932ec..6d5cde5dba 100644
--- a/js/dist/alert.js
+++ b/js/dist/alert.js
@@ -20,7 +20,6 @@ var Alert = function ($) {
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
var JQUERY_NO_CONFLICT = $.fn[NAME];
- var TRANSITION_DURATION = 150;
var Selector = {
DISMISS: '[data-dismiss="alert"]'
};
@@ -98,15 +97,16 @@ var Alert = function ($) {
$(element).removeClass(ClassName.SHOW);
- if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) {
+ if (!$(element).hasClass(ClassName.FADE)) {
this._destroyElement(element);
return;
}
+ var transitionDuration = Util.getTransitionDurationFromElement(element);
$(element).one(Util.TRANSITION_END, function (event) {
return _this._destroyElement(element, event);
- }).emulateTransitionEnd(TRANSITION_DURATION);
+ }).emulateTransitionEnd(transitionDuration);
};
_proto._destroyElement = function _destroyElement(element) {