From f4877dbf034e3f3f85d01fb7414569a44aff2976 Mon Sep 17 00:00:00 2001 From: ysds Date: Tue, 9 Apr 2019 20:12:05 +0900 Subject: [PATCH] Remove _close() and marge with _hide() --- js/src/toast.js | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/js/src/toast.js b/js/src/toast.js index 837c5dffb1..7548befd82 100644 --- a/js/src/toast.js +++ b/js/src/toast.js @@ -127,7 +127,21 @@ class Toast { } EventHandler.trigger(this._element, Event.HIDE) - this._close() + + const complete = () => { + this._element.classList.add(ClassName.HIDE) + EventHandler.trigger(this._element, Event.HIDDEN) + } + + this._element.classList.remove(ClassName.SHOW) + if (this._config.animation) { + const transitionDuration = getTransitionDurationFromElement(this._element) + + EventHandler.one(this._element, TRANSITION_END, complete) + emulateTransitionEnd(this._element, transitionDuration) + } else { + complete() + } } dispose() { @@ -172,23 +186,6 @@ class Toast { ) } - _close() { - const complete = () => { - this._element.classList.add(ClassName.HIDE) - EventHandler.trigger(this._element, Event.HIDDEN) - } - - this._element.classList.remove(ClassName.SHOW) - if (this._config.animation) { - const transitionDuration = getTransitionDurationFromElement(this._element) - - EventHandler.one(this._element, TRANSITION_END, complete) - emulateTransitionEnd(this._element, transitionDuration) - } else { - complete() - } - } - // Static static _jQueryInterface(config) {