rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Remove a few unneeded variables

Browse Source
This commit is contained in:
XhmikosR 2021-10-09 21:49:49 +03:00
parent 2964c12bb9
commit 0c3dfe104b
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/dom/event-handler.js
View File

@ -123,9 +123,7 @@ function bootstrapDelegationHandler(element, selector, fn) {
}
function findHandler(events, handler, delegationSelector = null) {
const uidEventList = Object.keys(events)
for (const uidEvent of uidEventList) {
for (const uidEvent of Object.keys(events)) {
const event = events[uidEvent]
if (event.originalHandler === handler && event.delegationSelector === delegationSelector) {
@ -140,9 +138,8 @@ function normalizeParams(originalTypeEvent, handler, delegationFn) {
const delegation = typeof handler === 'string'
const originalHandler = delegation ? delegationFn : handler
let typeEvent = getTypeEvent(originalTypeEvent)
const isNative = nativeEvents.has(typeEvent)
if (!isNative) {
if (!nativeEvents.has(typeEvent)) {
typeEvent = originalTypeEvent
}

15
js/src/modal.js
View File

@ -279,23 +279,22 @@ class Modal extends BaseComponent {
return
}
const { classList, scrollHeight, style } = this._element
const isModalOverflowing = scrollHeight > document.documentElement.clientHeight
const initialOverflowY = style.overflowY
const isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight
const initialOverflowY = this._element.style.overflowY
// return if the following background transition hasn't yet completed
if (initialOverflowY === 'hidden' || classList.contains(CLASS_NAME_STATIC)) {
if (initialOverflowY === 'hidden' || this._element.classList.contains(CLASS_NAME_STATIC)) {
return
}
if (!isModalOverflowing) {
style.overflowY = 'hidden'
this._element.style.overflowY = 'hidden'
}
classList.add(CLASS_NAME_STATIC)
this._element.classList.add(CLASS_NAME_STATIC)
this._queueCallback(() => {
classList.remove(CLASS_NAME_STATIC)
this._element.classList.remove(CLASS_NAME_STATIC)
this._queueCallback(() => {
style.overflowY = initialOverflowY
this._element.style.overflowY = initialOverflowY
}, this._dialog)
}, this._dialog)

9
js/src/util/focustrap.js
View File

@ -60,14 +60,12 @@ class FocusTrap extends Config {
// Public
activate() {
const { trapElement, autofocus } = this._config
if (this._isActive) {
return
}
if (autofocus) {
trapElement.focus()
if (this._config.autofocus) {
this._config.trapElement.focus()
}
EventHandler.off(document, EVENT_KEY) // guard against infinite focus loop
@ -88,10 +86,9 @@ class FocusTrap extends Config {
// Private
_handleFocusin(event) {
const { target } = event
const { trapElement } = this._config
if (target === document || target === trapElement || trapElement.contains(target)) {
if (event.target === document || event.target === trapElement || trapElement.contains(event.target)) {
return
}