Clear timeout before showing the toast (#31155)

* clear timeout before showing the toast * Add unit test * Remove the check for timeout * Check for clearTimeout to have been called Co-authored-by: XhmikosR <xhmikosr@gmail.com> # Conflicts: # js/tests/unit/toast.spec.js
twbs · Jul 29, 2020 · de0e1b5 · de0e1b5
1 parent cc49a5b
commit de0e1b5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/js/src/toast.js b/js/src/toast.js
@@ -83,6 +83,8 @@ class Toast {
       return
     }
 
+    this._clearTimeout()
+
     if (this._config.animation) {
       this._element.classList.add(CLASS_NAME_FADE)
     }
@@ -130,8 +132,7 @@ class Toast {
   }
 
   dispose() {
-    clearTimeout(this._timeout)
-    this._timeout = null
+    this._clearTimeout()
 
     if (this._element.classList.contains(CLASS_NAME_SHOW)) {
       this._element.classList.remove(CLASS_NAME_SHOW)
@@ -184,6 +185,11 @@ class Toast {
     }
   }
 
+  _clearTimeout() {
+    clearTimeout(this._timeout)
+    this._timeout = null
+  }
+
   // Static
 
   static _jQueryInterface(config) {