hide toast on dispose

twbs · Oct 23, 2018 · ce80dd0 · ce80dd0
1 parent 69758d6
commit ce80dd0
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/js/src/toast.js b/js/src/toast.js
@@ -132,6 +132,12 @@ const Toast = (($) => {
 
     dispose() {
       clearTimeout(this._timeout)
+      this._timeout = null
+
+      if (this._element.classList.contains(ClassName.SHOW)) {
+        this._element.classList.remove(ClassName.SHOW)
+      }
+
       $.removeData(this._element, DATA_KEY)
       this._element = null
       this._config  = null

diff --git a/js/tests/unit/toast.js b/js/tests/unit/toast.js
@@ -153,6 +153,37 @@ $(function () {
     assert.ok(typeof $toast.data('bs.toast') === 'undefined')
   })
 
+  QUnit.test('should allow to destroy toast and hide it before that', function (assert) {
+    assert.expect(4)
+    var done = assert.async()
+
+    var toastHtml =
+      '<div class="toast" data-delay="0" data-autohide="false">' +
+        '<div class="toast-body">' +
+          'a simple toast' +
+        '</div>' +
+      '</div>'
+
+    var $toast = $(toastHtml)
+      .bootstrapToast()
+      .appendTo($('#qunit-fixture'))
+
+    $toast.one('shown.bs.toast', function () {
+      setTimeout(function () {
+        assert.ok($toast.hasClass('show'))
+        assert.ok(typeof $toast.data('bs.toast') !== 'undefined')
+
+        $toast.bootstrapToast('dispose')
+
+        assert.ok(typeof $toast.data('bs.toast') === 'undefined')
+        assert.ok($toast.hasClass('show') === false)
+
+        done()
+      }, 1)
+    })
+      .bootstrapToast('show')
+  })
+
   QUnit.test('should allow to pass delay object in html', function (assert) {
     assert.expect(1)
     var done = assert.async()