Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2022-11-13 10:19:11 +0300
committerGitHub <noreply@github.com>2022-11-13 10:19:11 +0300
commit2fde88c20071f1e766703f78a25ebc431da9e1d8 (patch)
tree93d22528446f6f0f25aafbe66da421900ad7d9ae
parent0446e22b5aa556701f32015e9678f4ae822d1386 (diff)
Use `Object.entries` in more places (#37482)
-rw-r--r--js/src/dom/event-handler.js6
-rw-r--r--js/src/tooltip.js6
-rw-r--r--js/src/util/config.js3
3 files changed, 6 insertions, 9 deletions
diff --git a/js/src/dom/event-handler.js b/js/src/dom/event-handler.js
index 435935e83f..e235377e3e 100644
--- a/js/src/dom/event-handler.js
+++ b/js/src/dom/event-handler.js
@@ -198,9 +198,8 @@ function removeHandler(element, events, typeEvent, handler, delegationSelector)
function removeNamespacedHandlers(element, events, typeEvent, namespace) {
const storeElementEvent = events[typeEvent] || {}
- for (const handlerKey of Object.keys(storeElementEvent)) {
+ for (const [handlerKey, event] of Object.entries(storeElementEvent)) {
if (handlerKey.includes(namespace)) {
- const event = storeElementEvent[handlerKey]
removeHandler(element, events, typeEvent, event.callable, event.delegationSelector)
}
}
@@ -248,11 +247,10 @@ const EventHandler = {
}
}
- for (const keyHandlers of Object.keys(storeElementEvent)) {
+ for (const [keyHandlers, event] of Object.entries(storeElementEvent)) {
const handlerKey = keyHandlers.replace(stripUidRegex, '')
if (!inNamespace || originalTypeEvent.includes(handlerKey)) {
- const event = storeElementEvent[keyHandlers]
removeHandler(element, events, typeEvent, event.callable, event.delegationSelector)
}
}
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 02d11363a7..562b52db05 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -577,9 +577,9 @@ class Tooltip extends BaseComponent {
_getDelegateConfig() {
const config = {}
- for (const key in this._config) {
- if (this.constructor.Default[key] !== this._config[key]) {
- config[key] = this._config[key]
+ for (const [key, value] of Object.entries(this._config)) {
+ if (this.constructor.Default[key] !== value) {
+ config[key] = value
}
}
diff --git a/js/src/util/config.js b/js/src/util/config.js
index f2d24b4bac..9417ab8f8c 100644
--- a/js/src/util/config.js
+++ b/js/src/util/config.js
@@ -49,8 +49,7 @@ class Config {
}
_typeCheckConfig(config, configTypes = this.constructor.DefaultType) {
- for (const property of Object.keys(configTypes)) {
- const expectedTypes = configTypes[property]
+ for (const [property, expectedTypes] of Object.entries(configTypes)) {
const value = config[property]
const valueType = isElement(value) ? 'element' : toType(value)