diff options
author | Rohit Sharma <rohit2sharma95@gmail.com> | 2020-07-11 21:51:04 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-11 21:51:04 +0300 |
commit | f6348f6c89dabbbbe7d2edd1c9503256294b86f2 (patch) | |
tree | e9e78905a31863c8cd84d2b8a232afaf272a5a7f /js/src/toast.js | |
parent | 6acdfdbfa005197509e7cb60daab7e458dee80b1 (diff) |
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>
Diffstat (limited to 'js/src/toast.js')
-rw-r--r-- | js/src/toast.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/js/src/toast.js b/js/src/toast.js index 623e897714..cca6d553b0 100644 --- a/js/src/toast.js +++ b/js/src/toast.js @@ -91,6 +91,8 @@ class Toast { return } + this._clearTimeout() + if (this._config.animation) { this._element.classList.add(CLASS_NAME_FADE) } @@ -149,8 +151,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) @@ -186,6 +187,11 @@ class Toast { ) } + _clearTimeout() { + clearTimeout(this._timeout) + this._timeout = null + } + // Static static jQueryInterface(config) { |