Tooltip: merge `isAnimated` checks

1 files changed, 7 insertions, 5 deletions

diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index b0963a0021..a1e701981d 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -271,8 +271,7 @@ class Tooltip extends BaseComponent {
       }
     }
 
-    const isAnimated = this.tip.classList.contains(CLASS_NAME_FADE)
-    this._queueCallback(complete, this.tip, isAnimated)
+    this._queueCallback(complete, this.tip, this._isAnimated())
   }
 
   hide() {
@@ -315,8 +314,7 @@ class Tooltip extends BaseComponent {
     this._activeTrigger[TRIGGER_FOCUS] = false
     this._activeTrigger[TRIGGER_HOVER] = false
 
-    const isAnimated = this.tip.classList.contains(CLASS_NAME_FADE)
-    this._queueCallback(complete, this.tip, isAnimated)
+    this._queueCallback(complete, this.tip, this._isAnimated())
     this._hoverState = ''
   }
 
@@ -355,7 +353,7 @@ class Tooltip extends BaseComponent {
 
     tip.setAttribute('id', tipId)
 
-    if (this._config.animation) {
+    if (this._isAnimated()) {
       tip.classList.add(CLASS_NAME_FADE)
     }
 
@@ -409,6 +407,10 @@ class Tooltip extends BaseComponent {
     return context || this.constructor.getOrCreateInstance(event.delegateTarget, this._getDelegateConfig())
   }
 
+  _isAnimated() {
+    return this._config.animation || (this.tip && this.tip.classList.contains(CLASS_NAME_FADE))
+  }
+
   _getOffset() {
     const { offset } = this._config