Replace for...in loops with iterating over the object's keys

koops76 · koops76 · commit ed9fb82cca2c · 2017-07-08T05:29:43.000+03:00
diff --git a/chromium/background.js b/chromium/background.js
@@ -55,7 +55,7 @@
   })
   chrome.storage.onChanged.addListener(function (changes, areaName) {
     if (areaName === 'sync' || areaName === 'local') {
-      for (const key in changes) {
+      for (const key of changes.keys) {
         if (key === 'httpNowhere') {
           httpNowhereOn = changes[key].newValue
           window.updateState()
@@ -390,7 +390,7 @@
   function objSize (obj) {
     if (typeof obj === 'undefined') return 0
     let size = 0
-    for (const key in obj) {
+    for (const key of obj.keys) {
       if (obj.hasOwnProperty(key)) size++
     }
     return size
@@ -407,7 +407,7 @@
       return []
     }
     const tabInfo = window.switchPlannerInfo[tabId][rewritten]
-    for (const assetHost in tabInfo) {
+    for (const assetHost of tabInfo.keys) {
       const ah = tabInfo[assetHost]
       const activeCount = objSize(ah[1])
       const passiveCount = objSize(ah[0])
@@ -472,7 +472,7 @@
   function linksFromKeys (map) {
     if (typeof map === 'undefined') return ''
     let output = ''
-    for (const key in map) {
+    for (const key of map.keys) {
       if (map.hasOwnProperty(key)) {
         output += "<a href='" + key + "'>" + key + '</a><br/>'
       }
diff --git a/chromium/popup.js b/chromium/popup.js
@@ -131,7 +131,7 @@
     const activeTab = tabArray[0]
     const rulesets = backgroundPage.activeRulesets.getRulesets(activeTab.id)
 
-    for (const r in rulesets) {
+    for (const r of rulesets.keys) {
       let listDiv = stableRules
       if (!rulesets[r].defaultState) {
         listDiv = unstableRules
