From 1f4d7903db37de5f7efad455c307583cedf53b27 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Thu, 6 Dec 2018 13:53:01 +0100 Subject: fix fade animation for toast --- js/src/toast.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'js/src') diff --git a/js/src/toast.js b/js/src/toast.js index 23d482d35..471d11aeb 100644 --- a/js/src/toast.js +++ b/js/src/toast.js @@ -29,9 +29,10 @@ const Event = { } const ClassName = { - FADE : 'fade', - HIDE : 'hide', - SHOW : 'show' + FADE : 'fade', + HIDE : 'hide', + SHOW : 'show', + SHOWING : 'showing' } const DefaultType = { @@ -84,6 +85,9 @@ class Toast { } const complete = () => { + this._element.classList.remove(ClassName.SHOWING) + this._element.classList.add(ClassName.SHOW) + $(this._element).trigger(Event.SHOWN) if (this._config.autohide) { @@ -91,7 +95,8 @@ class Toast { } } - this._element.classList.add(ClassName.SHOW) + this._element.classList.remove(ClassName.HIDE) + this._element.classList.add(ClassName.SHOWING) if (this._config.animation) { const transitionDuration = Util.getTransitionDurationFromElement(this._element) @@ -162,11 +167,11 @@ class Toast { _close() { const complete = () => { + this._element.classList.add(ClassName.HIDE) $(this._element).trigger(Event.HIDDEN) } this._element.classList.remove(ClassName.SHOW) - if (this._config.animation) { const transitionDuration = Util.getTransitionDurationFromElement(this._element) -- cgit v1.2.3