From f97c75b59f1efbc2c9c01f86a94aebcb8dd78a20 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Sun, 28 Oct 2018 18:37:01 +0100 Subject: [PATCH 1/2] Move removing show class --- js/src/tab.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/src/tab.js b/js/src/tab.js index 4acb6f7f45f2..1a5029ebfd34 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -162,6 +162,7 @@ class Tab { const transitionDuration = Util.getTransitionDurationFromElement(active) $(active) + .removeClass(`${ClassName.SHOW}`) .one(Util.TRANSITION_END, complete) .emulateTransitionEnd(transitionDuration) } else { @@ -171,7 +172,7 @@ class Tab { _transitionComplete(element, active, callback) { if (active) { - $(active).removeClass(`${ClassName.SHOW} ${ClassName.ACTIVE}`) + $(active).removeClass(`${ClassName.ACTIVE}`) const dropdownChild = $(active.parentNode).find( Selector.DROPDOWN_ACTIVE_CHILD From 05153332bc6ee2b13017bf4a53e0fe7d067c77b6 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Sun, 28 Oct 2018 20:46:56 +0100 Subject: [PATCH 2/2] Remove template --- js/src/tab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/tab.js b/js/src/tab.js index 1a5029ebfd34..af296f74fe21 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -162,7 +162,7 @@ class Tab { const transitionDuration = Util.getTransitionDurationFromElement(active) $(active) - .removeClass(`${ClassName.SHOW}`) + .removeClass(ClassName.SHOW) .one(Util.TRANSITION_END, complete) .emulateTransitionEnd(transitionDuration) } else { @@ -172,7 +172,7 @@ class Tab { _transitionComplete(element, active, callback) { if (active) { - $(active).removeClass(`${ClassName.ACTIVE}`) + $(active).removeClass(ClassName.ACTIVE) const dropdownChild = $(active.parentNode).find( Selector.DROPDOWN_ACTIVE_CHILD