From edc43a4ea63312d95bd0779832c534cd3c14895b Mon Sep 17 00:00:00 2001 From: J2TeaM Date: Wed, 7 Sep 2016 02:55:48 +0700 Subject: [PATCH 1/3] Remove classes at one time --- js/src/carousel.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/js/src/carousel.js b/js/src/carousel.js index ff00d8aaf8..ea14d0c9a9 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -353,15 +353,10 @@ const Carousel = (($) => { $(activeElement) .one(Util.TRANSITION_END, () => { $(nextElement) - .removeClass(directionalClassName) - .removeClass(direction) + .removeClass(directionalClassName + ' ' + direction) + .addClass(ClassName.ACTIVE) - $(nextElement).addClass(ClassName.ACTIVE) - - $(activeElement) - .removeClass(ClassName.ACTIVE) - .removeClass(direction) - .removeClass(directionalClassName) + $(activeElement).removeClass(ClassName.ACTIVE + ' ' + direction + ' ' + directionalClassName) this._isSliding = false From 4f5a7c96e73071d2d75a0fa135797c9ee15969ed Mon Sep 17 00:00:00 2001 From: J2TeaM Date: Wed, 7 Sep 2016 03:17:19 +0700 Subject: [PATCH 2/3] Fix eslint (prefer-template) --- js/src/carousel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/carousel.js b/js/src/carousel.js index ea14d0c9a9..92d91ff2f0 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -353,10 +353,10 @@ const Carousel = (($) => { $(activeElement) .one(Util.TRANSITION_END, () => { $(nextElement) - .removeClass(directionalClassName + ' ' + direction) + .removeClass(`${directionalClassName} ${direction}`) .addClass(ClassName.ACTIVE) - $(activeElement).removeClass(ClassName.ACTIVE + ' ' + direction + ' ' + directionalClassName) + $(activeElement).removeClass(`${ClassName.ACTIVE} ${direction} ${directionalClassName}`) this._isSliding = false From 4f520c7ff301ce42f01e32bd77606ce94384cd13 Mon Sep 17 00:00:00 2001 From: J2TeaM Date: Wed, 7 Sep 2016 10:09:54 +0700 Subject: [PATCH 3/3] Merge #20563 and #20567 --- js/src/popover.js | 4 +--- js/src/tooltip.js | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/js/src/popover.js b/js/src/popover.js index 7ea5608123..eae17f1d35 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -119,9 +119,7 @@ const Popover = (($) => { this.setElementContent($tip.find(Selector.TITLE), this.getTitle()) this.setElementContent($tip.find(Selector.CONTENT), this._getContent()) - $tip - .removeClass(ClassName.FADE) - .removeClass(ClassName.IN) + $tip.removeClass(`${ClassName.FADE} ${ClassName.IN}`) this.cleanupTether() } diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 08daae2f2b..e0691f14c1 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -371,9 +371,7 @@ const Tooltip = (($) => { this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()) - $tip - .removeClass(ClassName.FADE) - .removeClass(ClassName.IN) + $tip.removeClass(`${ClassName.FADE} ${ClassName.IN}`) this.cleanupTether() }