diff options
author | Mark Otto <markdotto@gmail.com> | 2018-03-31 23:59:37 +0300 |
---|---|---|
committer | Mark Otto <markdotto@gmail.com> | 2018-03-31 23:59:37 +0300 |
commit | b744ba2c084dd382d5bad8266827bf1a49a864de (patch) | |
tree | c3870abb57537fccf28d0f840c906411ead566bb /js/dist/tab.js | |
parent | cf7136364991378dfd7f076e28bb2b945a9b5f5f (diff) |
dist
Diffstat (limited to 'js/dist/tab.js')
-rw-r--r-- | js/dist/tab.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/dist/tab.js b/js/dist/tab.js index 2630a5897f..2b9e65b1f0 100644 --- a/js/dist/tab.js +++ b/js/dist/tab.js @@ -20,7 +20,6 @@ var Tab = function ($) { var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; - var TRANSITION_DURATION = 150; var Event = { HIDE: "hide" + EVENT_KEY, HIDDEN: "hidden" + EVENT_KEY, @@ -139,14 +138,15 @@ var Tab = function ($) { } var active = activeElements[0]; - var isTransitioning = callback && Util.supportsTransitionEnd() && active && $(active).hasClass(ClassName.FADE); + var isTransitioning = callback && active && $(active).hasClass(ClassName.FADE); var complete = function complete() { return _this2._transitionComplete(element, active, callback); }; if (active && isTransitioning) { - $(active).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION); + var transitionDuration = Util.getTransitionDurationFromElement(active); + $(active).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration); } else { complete(); } |