diff options
author | Alessandro Chitolina <alekitto@gmail.com> | 2017-11-25 18:07:41 +0300 |
---|---|---|
committer | Johann-S <johann.servoire@gmail.com> | 2017-11-26 22:29:19 +0300 |
commit | 80d4a51e79b951f11f61ed7a302d331b7942c920 (patch) | |
tree | c4256df1db7a7c4cd5ccb363e3bf9fed2715c476 /js/src/tab.js | |
parent | 544b3ee954179f7cfbd25f8dd7894394ca834105 (diff) |
tab.js: do not remove fade class if there's no initial active pane
Diffstat (limited to 'js/src/tab.js')
-rw-r--r-- | js/src/tab.js | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/js/src/tab.js b/js/src/tab.js index 1d4178687d..e299f0b128 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -166,7 +166,6 @@ const Tab = (($) => { const complete = () => this._transitionComplete( element, active, - isTransitioning, callback ) @@ -174,19 +173,14 @@ const Tab = (($) => { $(active) .one(Util.TRANSITION_END, complete) .emulateTransitionEnd(TRANSITION_DURATION) - } else { complete() } - - if (active) { - $(active).removeClass(ClassName.SHOW) - } } - _transitionComplete(element, active, isTransitioning, callback) { + _transitionComplete(element, active, callback) { if (active) { - $(active).removeClass(ClassName.ACTIVE) + $(active).removeClass(`${ClassName.SHOW} ${ClassName.ACTIVE}`) const dropdownChild = $(active.parentNode).find( Selector.DROPDOWN_ACTIVE_CHILD @@ -206,12 +200,8 @@ const Tab = (($) => { element.setAttribute('aria-selected', true) } - if (isTransitioning) { - Util.reflow(element) - $(element).addClass(ClassName.SHOW) - } else { - $(element).removeClass(ClassName.FADE) - } + Util.reflow(element) + $(element).addClass(ClassName.SHOW) if (element.parentNode && $(element.parentNode).hasClass(ClassName.DROPDOWN_MENU)) { |