From 8e7ba02c5cf56bdc5b4c0fff71edec19ade1e3e9 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Tue, 10 Oct 2017 13:19:39 +0200 Subject: Modal plugin set _isTransitioning after the trigger of hide event --- js/src/modal.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'js/src') diff --git a/js/src/modal.js b/js/src/modal.js index 1ea630c41..399adc4c1 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -169,12 +169,6 @@ const Modal = (() => { return } - const transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE) - - if (transition) { - this._isTransitioning = true - } - const hideEvent = $.Event(Event.HIDE) $(this._element).trigger(hideEvent) @@ -185,6 +179,12 @@ const Modal = (() => { this._isShown = false + const transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE) + + if (transition) { + this._isTransitioning = true + } + this._setEscapeEvent() this._setResizeEvent() -- cgit v1.2.3