rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modal: move common check to a function

Browse source
This commit is contained in:
XhmikosR 2020-11-11 14:48:39 +02:00
parent 37186db5fc
commit 484843856d
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
js/src/modal.js
View file

@ -229,6 +229,10 @@ class Modal {
return config
}
_isElementOverflowing() {
return this._element.scrollHeight > document.documentElement.clientHeight
}
_triggerBackdropTransition() {
const hideEventPrevented = $.Event(EVENT_HIDE_PREVENTED)
@ -237,9 +241,7 @@ class Modal {
return
}
const isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight
if (!isModalOverflowing) {
if (!this._isElementOverflowing()) {
this._element.style.overflowY = 'hidden'
}
@ -250,7 +252,7 @@ class Modal {
$(this._element).one(Util.TRANSITION_END, () => {
this._element.classList.remove(CLASS_NAME_STATIC)
if (!isModalOverflowing) {
if (!this._isElementOverflowing()) {
$(this._element).one(Util.TRANSITION_END, () => {
this._element.style.overflowY = ''
})
@ -453,13 +455,11 @@ class Modal {
// ----------------------------------------------------------------------
_adjustDialog() {
const isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight
if (!this._isBodyOverflowing && isModalOverflowing) {
if (!this._isBodyOverflowing && this._isElementOverflowing()) {
this._element.style.paddingLeft = `${this._scrollbarWidth}px`
}
if (this._isBodyOverflowing && !isModalOverflowing) {
if (this._isBodyOverflowing && !this._isElementOverflowing()) {
this._element.style.paddingRight = `${this._scrollbarWidth}px`
}
}