Issue 4864 - Start using ESLint for adblockpluschrome

chrome/ext/common.js

Index: chrome/ext/common.js
diff --git a/chrome/ext/common.js b/chrome/ext/common.js
index 5401aaa2885a234c537d2dcbdd4b1267e04f0660..3210849c91811e151985d0273893914d25e62965 100644
--- a/chrome/ext/common.js
+++ b/chrome/ext/common.js
@@ -17,33 +17,32 @@
 
 "use strict";
 
-{

[Sebastian Noack, 2017/02/09 01:04:49]

I just noticed separating ext/common.js and chrome/ext/common.js does no longer
make sense since Safari is gone. So while changing the whole code here (due to
indentation) anyway, how about merging those files instead. That shouldn't make
the patch much larger, but would simplify the code structure a bit, while
getting rid of the redundant block.

[kzar, 2017/02/20 10:27:29]

Done.

-  // Workaround since HTMLCollection and NodeList didn't have iterator support
-  // before Chrome 51.
-  // https://bugs.chromium.org/p/chromium/issues/detail?id=401699
-  if (!(Symbol.iterator in HTMLCollection.prototype))
-    HTMLCollection.prototype[Symbol.iterator] = Array.prototype[Symbol.iterator];
-  if (!(Symbol.iterator in NodeList.prototype))
-    NodeList.prototype[Symbol.iterator] = Array.prototype[Symbol.iterator];
+// Workaround since HTMLCollection and NodeList didn't have iterator support
+// before Chrome 51.
+// https://bugs.chromium.org/p/chromium/issues/detail?id=401699
+let arrayIterator = Array.prototype[Symbol.iterator];
+if (!(Symbol.iterator in HTMLCollection.prototype))
+  HTMLCollection.prototype[Symbol.iterator] = arrayIterator;
+if (!(Symbol.iterator in NodeList.prototype))
+  NodeList.prototype[Symbol.iterator] = arrayIterator;
 
-  /* Message passing */
+/* Message passing */
 
-  ext.onMessage = new ext._EventTarget();
+ext.onMessage = new ext._EventTarget();
 
 
-  /* Background page */
+/* Background page */
 
-  ext.backgroundPage = {
-    sendMessage: chrome.runtime.sendMessage,
-    getWindow()
-    {
-      return chrome.extension.getBackgroundPage();
-    }
-  };
+ext.backgroundPage = {
+  sendMessage: chrome.runtime.sendMessage,
+  getWindow()
+  {
+    return chrome.extension.getBackgroundPage();
+  }
+};
 
 
-  /* Utils */
+/* Utils */
 
-  ext.getURL = chrome.extension.getURL;
-  ext.i18n = chrome.i18n;
-}
+ext.getURL = chrome.extension.getURL;
+ext.i18n = chrome.i18n;