Merge #20563 and #20567

diff --git a/js/src/popover.js b/js/src/popover.js
index 7ea5608123e06b8a78fb6d4d07a9ee576e3f664a..eae17f1d35ac63c9c42eee38001c8d6aa804884d 100644 (file)
--- 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 08daae2f2bf5ceada9eb492dd936ed436e68e378..e0691f14c14fe18736046db9b98ee1bb5b229c60 100644 (file)
--- 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()
     }