From 8bcfae7bed536788457b5f9f389607667bc1822c Mon Sep 17 00:00:00 2001
From: Peter deHaan <peter@deseloper.com>
Date: Tue, 10 Jan 2017 09:44:14 -0800
Subject: [PATCH] Fix ESLint errors and add eqeqeq rule (#66)

---
 .eslintrc.js             | 24 +++++++----------------
 index.js                 | 42 +++++++++++++++++++---------------------
 webextension/js/popup.js |  2 +-
 3 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index cb7ee92..5305812 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,25 +1,15 @@
 module.exports = {
     "env": {
         "browser": true,
-        "es6": true
+        "es6": true,
+        "node": true
     },
     "extends": "eslint:recommended",
     "rules": {
-        "indent": [
-            "error",
-            2
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "double"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ]
+        "eqeqeq": "error",
+        "indent": ["error", 2],
+        "linebreak-style": ["error", "unix"],
+        "quotes": ["error", "double"],
+        "semi": ["error", "always"]
     }
 };
diff --git a/index.js b/index.js
index d93b351..91656d9 100644
--- a/index.js
+++ b/index.js
@@ -1,9 +1,7 @@
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-/* global require */
-
 const { attachTo } = require("sdk/content/mod");
-const {ContextualIdentityService} = require("resource://gre/modules/ContextualIdentityService.jsm");
+const { ContextualIdentityService } = require("resource://gre/modules/ContextualIdentityService.jsm");
 const self = require("sdk/self");
 const { Style } = require("sdk/stylesheet/style");
 const tabs = require("sdk/tabs");
@@ -41,14 +39,14 @@ let ContainerService = {
       "sortTabs",
       "openTab",
       "queryIdentities",
-      "getIdentity",
+      "getIdentity"
     ];
 
     // Map of identities.
     ContextualIdentityService.getIdentities().forEach(identity => {
       this._identitiesState[identity.userContextId] = {
         hiddenTabUrls: [],
-        openTabs: 0,
+        openTabs: 0
       };
     });
 
@@ -91,7 +89,7 @@ let ContainerService = {
 
     webExtension.startup().then(api => {
       api.browser.runtime.onMessage.addListener((message, sender, sendReply) => {
-        if ("method" in message && methods.indexOf(message.method) != -1) {
+        if ("method" in message && methods.indexOf(message.method) !== -1) {
           sendReply(this[message.method](message));
         }
       });
@@ -106,31 +104,31 @@ let ContainerService = {
     // we map URLs to svg IDs.
     let image, color;
 
-    if (identity.icon == "fingerprint" ||
-        identity.icon == "chrome://browser/skin/usercontext/personal.svg") {
+    if (identity.icon === "fingerprint" ||
+        identity.icon === "chrome://browser/skin/usercontext/personal.svg") {
       image = "fingerprint";
-    } else if (identity.icon == "briefcase" ||
-             identity.icon == "chrome://browser/skin/usercontext/work.svg") {
+    } else if (identity.icon === "briefcase" ||
+             identity.icon === "chrome://browser/skin/usercontext/work.svg") {
       image = "briefcase";
-    } else if (identity.icon == "dollar" ||
-             identity.icon == "chrome://browser/skin/usercontext/banking.svg") {
+    } else if (identity.icon === "dollar" ||
+             identity.icon === "chrome://browser/skin/usercontext/banking.svg") {
       image = "dollar";
-    } else if (identity.icon == "cart" ||
-             identity.icon == "chrome://browser/skin/usercontext/shopping.svg") {
+    } else if (identity.icon === "cart" ||
+             identity.icon === "chrome://browser/skin/usercontext/shopping.svg") {
       image = "cart";
     } else {
       image = "circle";
     }
 
-    if (identity.color == "#00a7e0") {
+    if (identity.color === "#00a7e0") {
       color = "blue";
-    } else if (identity.color == "#f89c24") {
+    } else if (identity.color === "#f89c24") {
       color = "orange";
-    } else if (identity.color == "#7dc14c") {
+    } else if (identity.color === "#7dc14c") {
       color = "green";
-    } else if (identity.color == "#ee5195") {
+    } else if (identity.color === "#ee5195") {
       color = "pink";
-    } else if (["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple"].indexOf(identity.color) != -1) {
+    } else if (["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple"].indexOf(identity.color) !== -1) {
       color = identity.color;
     } else {
       color = "";
@@ -142,7 +140,7 @@ let ContainerService = {
       color,
       userContextId: identity.userContextId,
       hasHiddenTabs: !!this._identitiesState[identity.userContextId].hiddenTabUrls.length,
-      hasOpenTabs: !!this._identitiesState[identity.userContextId].openTabs,
+      hasOpenTabs: !!this._identitiesState[identity.userContextId].openTabs
     };
   },
 
@@ -154,7 +152,7 @@ let ContainerService = {
         let xulTab = viewFor(tab);
         let userContextId = parseInt(xulTab.getAttribute("usercontextid") || 0, 10);
 
-        if ("userContextId" in args && args.userContextId != userContextId) {
+        if ("userContextId" in args && args.userContextId !== userContextId) {
           continue;
         }
 
@@ -296,7 +294,7 @@ let ContainerService = {
     let style = Style({ uri: self.data.url("chrome.css") });
 
     attachTo(style, viewFor(window));
-  },
+  }
 };
 
 ContainerService.init();
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index ff52c6b..16fb90c 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -111,7 +111,7 @@ browser.runtime.sendMessage({method: "queryIdentities"}).then(identities => {
         showOrHideContainerTabs(identity.userContextId, true).then(() => {
           browser.runtime.sendMessage({
             method: "openTab",
-            userContextId: identity.userContextId,
+            userContextId: identity.userContextId
           }).then(() => {
             window.close();
           });