From: J2TeaM <junookyo@gmail.com>
Date: Wed, 7 Sep 2016 03:09:54 +0000 (+0700)
Subject: Merge #20563 and #20567
X-Git-Tag: v4.0.0-alpha.6~365^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f520c7ff301ce42f01e32bd77606ce94384cd13;p=thirdparty%2Fbootstrap.git

Merge #20563 and #20567
---

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()
     }