Use `Object.entries` in more places (#37482)

diff --git a/js/src/dom/event-handler.js b/js/src/dom/event-handler.js
index 435935e83fc32f2c0996de41981ee4ba2ca741e1..e235377e3e5a6980f6e35fcc0f2c2542679524ca 100644 (file)
--- 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 02d11363a7c60f662e769777b7f9cc7d024a16be..562b52db058ce07ebb53ce850b87050b1028fbb3 100644 (file)
--- 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 f2d24b4bace46f56c19f265184ce4b8d481d323d..9417ab8f8c19103ade5ff8415a07c49d54681385 100644 (file)
--- 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)