Bug 1245649: Enable no-negated-in-lhs, no-native-reassign, no-func-assign and no-labels. r=MattN

toolkit/.eslintrc

@@ -62,7 +62,7 @@
     "no-duplicate-case": 2,
 
     // No labels
-    // "no-labels": 2,
+    "no-labels": 2,
 
     // If an if block ends with a return no need for an else block
     // "no-else-return": 2,
@@ -86,7 +86,7 @@
     "no-extra-semi": 2,
 
     // No overwriting defined functions
-    // "no-func-assign": 2,
+    "no-func-assign": 2,
 
     // No invalid regular expresions
     "no-invalid-regexp": 2,
@@ -104,10 +104,10 @@
     // "no-multi-spaces": [2, { exceptions: { "AssignmentExpression": true, "VariableDeclarator": true, "ArrayExpression": true, "ObjectExpression": true } }],
 
     // No reassigning native JS objects
-    // "no-native-reassign": 2,
+    "no-native-reassign": 2,
 
     // No (!foo in bar)
-    // "no-negated-in-lhs": 2,
+    "no-negated-in-lhs": 2,
 
     // Nested ternary statements are confusing
     // "no-nested-ternary": 2,

toolkit/components/asyncshutdown/AsyncShutdown.jsm

@@ -178,7 +178,7 @@ PromiseSet.prototype = {
     if (!key || typeof key != "object") {
       throw new Error("Expected an object");
     }
-    if ((!"then" in key) || typeof key.then != "function") {
+    if ((!("then" in key)) || typeof key.then != "function") {
       throw new Error("Expected a Promise");
     }
   },

toolkit/components/formautofill/FormAutofillStartup.js

@@ -49,7 +49,7 @@ FormAutofillStartup.prototype = {
     // raised in the parent process is caught and serialized into the reply
     // message that is sent to the requesting child process.
     FormAutofill.processRequestAutocomplete(aMessage.data)
-      .catch(ex => { exception: ex })
+      .catch(ex => { return { exception: ex } })
       .then(result => {
         // The browser message manager in the parent will send the reply to the
         // associated frame message manager in the child.

toolkit/content/widgets/toolbar.xml

@@ -242,12 +242,12 @@
 
             var children = this.childNodes;
 
-            iter:
             // iterate over the ids to use on the toolbar
             for (let i = 0; i < ids.length; i++) {
-              let  id = ids[i];
+              let id = ids[i];
               // iterate over the existing nodes on the toolbar. nodeidx is the
               // spot where we want to insert items.
+              let found = false;
               for (let c = nodeidx; c < children.length; c++) {
                 let curNode = children[c];
                 if (this._idFromNode(curNode) == id) {
@@ -260,9 +260,14 @@
 
                   added[curNode.id] = true;
                   nodeidx++;
-                  continue iter; // move on to the next id
+                  found = true;
+                  break;
                 }
               }
+              if (found) {
+                // move on to the next id
+                continue;
+              }
 
               // the node isn't already on the toolbar, so add a new one.
               var nodeToAdd = paletteItems[id] || this._getToolbarItem(id);

toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm

@@ -194,7 +194,7 @@ var SimpleServiceDiscovery = {
     fixedDevices = JSON.parse(fixedDevices);
     for (let fixedDevice of fixedDevices) {
       // Verify we have the right data
-      if (!"location" in fixedDevice || !"target" in fixedDevice) {
+      if (!("location" in fixedDevice) || !("target" in fixedDevice)) {
         continue;
       }