diff options
| author | Martijn Cuppens <martijn.cuppens@gmail.com> | 2018-03-13 11:59:20 +0300 |
|---|---|---|
| committer | Johann-S <johann.servoire@gmail.com> | 2018-03-13 11:59:20 +0300 |
| commit | 1fadad1c33b99b94a4a821fe5c62c8064d129424 (patch) | |
| tree | 8ea41f4bf03696e7718cc7c3e1216b7153b2fc85 /js/src/tab.js | |
| parent | 1859595cb6e1c92ba8134a7c12a087cb05f89688 (diff) | |
Variable transition durations (#25662)
Diffstat (limited to 'js/src/tab.js')
| -rw-r--r-- | js/src/tab.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/js/src/tab.js b/js/src/tab.js index d3da382764..ebf28d76c7 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -15,13 +15,12 @@ const Tab = (($) => { * ------------------------------------------------------------------------ */ - const NAME = 'tab' - const VERSION = '4.0.0' - const DATA_KEY = 'bs.tab' - const EVENT_KEY = `.${DATA_KEY}` - const DATA_API_KEY = '.data-api' - const JQUERY_NO_CONFLICT = $.fn[NAME] - const TRANSITION_DURATION = 150 + const NAME = 'tab' + const VERSION = '4.0.0' + const DATA_KEY = 'bs.tab' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' + const JQUERY_NO_CONFLICT = $.fn[NAME] const Event = { HIDE : `hide${EVENT_KEY}`, @@ -162,9 +161,11 @@ const Tab = (($) => { ) if (active && isTransitioning) { + const transitionDuration = Util.getTransitionDurationFromElement(active) + $(active) .one(Util.TRANSITION_END, complete) - .emulateTransitionEnd(TRANSITION_DURATION) + .emulateTransitionEnd(transitionDuration) } else { complete() } |