Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann-S <johann.servoire@gmail.com>2017-10-10 14:19:39 +0300
committerJohann-S <johann.servoire@gmail.com>2017-10-10 15:19:22 +0300
commit8e7ba02c5cf56bdc5b4c0fff71edec19ade1e3e9 (patch)
treebbbf3c650d76e57c38fb51568d40506fdc52b6a5 /js/src/modal.js
parentda22bce2f073d95689a474b294cd16db9ed41862 (diff)
Modal plugin set _isTransitioning after the trigger of hide event
Diffstat (limited to 'js/src/modal.js')
-rw-r--r--js/src/modal.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/src/modal.js b/js/src/modal.js
index 1ea630c415..399adc4c12 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()