mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-20 20:00:36 +03:00
Use Object.entries in more places
This commit is contained in:
@@ -208,9 +208,8 @@ function removeHandler(element, events, typeEvent, handler, delegationSelector)
|
|||||||
function removeNamespacedHandlers(element, events, typeEvent, namespace) {
|
function removeNamespacedHandlers(element, events, typeEvent, namespace) {
|
||||||
const storeElementEvent = events[typeEvent] || {}
|
const storeElementEvent = events[typeEvent] || {}
|
||||||
|
|
||||||
for (const handlerKey of Object.keys(storeElementEvent)) {
|
for (const [handlerKey, event] of Object.entries(storeElementEvent)) {
|
||||||
if (handlerKey.includes(namespace)) {
|
if (handlerKey.includes(namespace)) {
|
||||||
const event = storeElementEvent[handlerKey]
|
|
||||||
removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
|
removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -258,11 +257,10 @@ const EventHandler = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const storeElementEvent = events[typeEvent] || {}
|
const storeElementEvent = events[typeEvent] || {}
|
||||||
for (const keyHandlers of Object.keys(storeElementEvent)) {
|
for (const [keyHandlers, event] of Object.entries(storeElementEvent)) {
|
||||||
const handlerKey = keyHandlers.replace(stripUidRegex, '')
|
const handlerKey = keyHandlers.replace(stripUidRegex, '')
|
||||||
|
|
||||||
if (!inNamespace || originalTypeEvent.includes(handlerKey)) {
|
if (!inNamespace || originalTypeEvent.includes(handlerKey)) {
|
||||||
const event = storeElementEvent[keyHandlers]
|
|
||||||
removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
|
removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -295,10 +293,10 @@ const EventHandler = {
|
|||||||
|
|
||||||
// merge custom information in our event
|
// merge custom information in our event
|
||||||
if (typeof args !== 'undefined') {
|
if (typeof args !== 'undefined') {
|
||||||
for (const key of Object.keys(args)) {
|
for (const [key, value] of Object.entries(args)) {
|
||||||
Object.defineProperty(evt, key, {
|
Object.defineProperty(evt, key, {
|
||||||
get() {
|
get() {
|
||||||
return args[key]
|
return value
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -625,9 +625,9 @@ class Tooltip extends BaseComponent {
|
|||||||
_getDelegateConfig() {
|
_getDelegateConfig() {
|
||||||
const config = {}
|
const config = {}
|
||||||
|
|
||||||
for (const key in this._config) {
|
for (const [key, value] of Object.entries(this._config)) {
|
||||||
if (this.constructor.Default[key] !== this._config[key]) {
|
if (this.constructor.Default[key] !== value) {
|
||||||
config[key] = this._config[key]
|
config[key] = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,8 +46,7 @@ class Config {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_typeCheckConfig(config, configTypes = this.constructor.DefaultType) {
|
_typeCheckConfig(config, configTypes = this.constructor.DefaultType) {
|
||||||
for (const property of Object.keys(configTypes)) {
|
for (const [property, expectedTypes] of Object.entries(configTypes)) {
|
||||||
const expectedTypes = configTypes[property]
|
|
||||||
const value = config[property]
|
const value = config[property]
|
||||||
const valueType = isElement(value) ? 'element' : toType(value)
|
const valueType = isElement(value) ? 'element' : toType(value)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user