diff options
| author | Johann-S <[email protected]> | 2017-10-10 13:19:39 +0200 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2017-10-10 14:19:22 +0200 |
| commit | 8e7ba02c5cf56bdc5b4c0fff71edec19ade1e3e9 (patch) | |
| tree | bbbf3c650d76e57c38fb51568d40506fdc52b6a5 /js/src | |
| parent | da22bce2f073d95689a474b294cd16db9ed41862 (diff) | |
| download | bootstrap-8e7ba02c5cf56bdc5b4c0fff71edec19ade1e3e9.tar.xz bootstrap-8e7ba02c5cf56bdc5b4c0fff71edec19ade1e3e9.zip | |
Modal plugin set _isTransitioning after the trigger of hide event
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/modal.js | 12 |
1 files changed, 6 insertions, 6 deletions
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() |