rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

refactor(Modal): add _isTransitioning default value

Browse Source 
Having variables initialised from start `_isTransitioning` is better.
Would be better to add an eslint rule to check for undeclared variables use.
Reordered enter checks for `show` and `hide` by priority.
This commit is contained in:
Andrew Luca 2018-10-17 02:57:04 +03:00 committed by Johann-S
parent 2b21657cd4
commit 65dc8c9070
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/modal.js
View File

@ -81,6 +81,7 @@ class Modal {
this._isShown = false
this._isBodyOverflowing = false
this._ignoreBackdropClick = false
this._isTransitioning = false
this._scrollbarWidth = 0
}
@ -101,7 +102,7 @@ class Modal {
}
show(relatedTarget) {
if (this._isTransitioning || this._isShown) {
if (this._isShown || this._isTransitioning) {
return
}
@ -153,7 +154,7 @@ class Modal {
event.preventDefault()
}
if (this._isTransitioning || !this._isShown) {
if (!this._isShown || this._isTransitioning) {
return
}
@ -206,6 +207,7 @@ class Modal {
this._isShown = null
this._isBodyOverflowing = null
this._ignoreBackdropClick = null
this._isTransitioning = null
this._scrollbarWidth = null
}