Refactor away the array forEach calls

Modern JS for loops appear to be more readable.
c3er · Jan 4, 2025 · 7498c28 · 7498c28
1 parent 57324b2
commit 7498c28
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/app/lib/contentBlockingRenderer.js b/app/lib/contentBlockingRenderer.js
@@ -50,24 +50,22 @@ function hasBlockedElements() {
 function unblockURL(url) {
     ipc.send(ipc.messages.unblockURL, url)
 
-    const elements = _blockedElements[url]
-    if (elements) {
-        elements.forEach(element => {
-            element.removeAttribute("style")
-
-            // Force element to reload without recreating the DOM element.
-            // Recreating the DOM element would cause the attached event handlers to be lost.
-            const attributes = element.attributes
-            for (let i = 0; i < attributes.length; i++) {
-                const attr = attributes[i]
-                const value = attr.nodeValue
-                if (value === url) {
-                    element.setAttribute(attr.nodeName, value)
-                }
+    const elements = _blockedElements[url] ?? []
+    for (const element of elements) {
+        element.removeAttribute("style")
+
+        // Force element to reload without recreating the DOM element.
+        // Recreating the DOM element would cause the attached event handlers to be lost.
+        const attributes = element.attributes
+        for (let i = 0; i < attributes.length; i++) {
+            const attr = attributes[i]
+            const value = attr.nodeValue
+            if (value === url) {
+                element.setAttribute(attr.nodeName, value)
             }
-        })
-        delete _blockedElements[url]
+        }
     }
+    delete _blockedElements[url]
 
     if (!hasBlockedElements()) {
         changeInfoElementVisiblity(false)
@@ -97,7 +95,9 @@ exports.init = (document, window, shallForceInitialization) => {
 
     ipc.listen(ipc.messages.contentBlocked, url => {
         const elements = (_blockedElements[url] = searchElementsWithAttributeValue(url))
-        elements.forEach(element => (element.onclick = () => unblockURL(url)))
+        for (const element of elements) {
+            element.onclick = () => unblockURL(url)
+        }
 
         changeInfoElementVisiblity(true)
         _document.getElementById(_elementIDs.textContainer).onclick = unblockAll

diff --git a/test/mocking.js b/test/mocking.js
@@ -94,9 +94,15 @@ class IpcChannel {
     _targetAssertionCallbacks = []
 
     send(event, ...args) {
-        this._targetCallbacks.forEach(callback => callback(event, ...args))
-        this._sourceAssertionCallbacks.forEach(callback => callback(event, ...args))
-        this._targetAssertionCallbacks.forEach(callback => callback(event, ...args))
+        for (const callback of this._targetCallbacks) {
+            callback(event, ...args)
+        }
+        for (const callback of this._sourceAssertionCallbacks) {
+            callback(event, ...args)
+        }
+        for (const callback of this._targetAssertionCallbacks) {
+            callback(event, ...args)
+        }
     }
 
     addTarget(callback) {