aboutsummaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
Diffstat (limited to 'js/src')
-rw-r--r--js/src/modal.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/src/modal.js b/js/src/modal.js
index 2e3017024..a23bfc1ba 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -104,22 +104,22 @@ class Modal {
return
}
- if ($(this._element).hasClass(CLASS_NAME_FADE)) {
- this._isTransitioning = true
- }
-
const showEvent = $.Event(EVENT_SHOW, {
relatedTarget
})
$(this._element).trigger(showEvent)
- if (this._isShown || showEvent.isDefaultPrevented()) {
+ if (showEvent.isDefaultPrevented()) {
return
}
this._isShown = true
+ if ($(this._element).hasClass(CLASS_NAME_FADE)) {
+ this._isTransitioning = true
+ }
+
this._checkScrollbar()
this._setScrollbar()