shield-recipe-client: Remove .eslintrc and match general mozilla-central style draft
authorMythmon <mcooper@mozilla.com>
Mon, 10 Oct 2016 10:06:44 -0700
changeset 423249 af211d85cad08eb77105e77baabb3ca8883cd599
parent 423247 bdf79cb516ec76f05611820b6f966f42b0b03797
child 533402 f7271e6a102a40ce19b695ff38e0c45685058d3d
push id31846
push userbmo:mcooper@mozilla.com
push dateMon, 10 Oct 2016 17:07:03 +0000
milestone52.0a1
shield-recipe-client: Remove .eslintrc and match general mozilla-central style MozReview-Commit-ID: 5XFaU3RUdZs
browser/extensions/shield-recipe-client/.eslintrc.yaml
browser/extensions/shield-recipe-client/lib/NormandyDriver.js
browser/extensions/shield-recipe-client/lib/RecipeRunner.js
deleted file mode 100644
--- a/browser/extensions/shield-recipe-client/.eslintrc.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-extends: 'normandy'
-plugins:
-  - mozilla
-
-rules:
-  indent: [1, 2, {SwitchCase: 1}]
-  mozilla/no-aArgs: [1]
-  mozilla/this-top-level-scope: [1]
-  no-console: [1]
-  mozilla/balanced-listeners: [0]
-
-globals:
-  require: false
-  exports: true
-  uneval: false
-  crypto: true
-  TextEncoder: true
--- a/browser/extensions/shield-recipe-client/lib/NormandyDriver.js
+++ b/browser/extensions/shield-recipe-client/lib/NormandyDriver.js
@@ -101,17 +101,17 @@ exports.NormandyDriver = function(recipe
       ret = ret.slice(1, ret.length - 1);
       return ret;
     },
 
     createStorage(keyPrefix) {
       let storage;
       try {
         storage = new Storage(keyPrefix, sandbox);
-      } catch(e) {
+      } catch (e) {
         Log.error(e.stack);
         throw e;
       }
       return storage;
     },
 
     location() {
       let location = Cu.cloneInto({countryCode: extraContext.country}, sandbox);
--- a/browser/extensions/shield-recipe-client/lib/RecipeRunner.js
+++ b/browser/extensions/shield-recipe-client/lib/RecipeRunner.js
@@ -93,27 +93,26 @@ exports.RecipeRunner = {
    * @param {string} recipe.filter The expression to evaluate against the environment.
    * @param {object} extraContext Any extra context to provide to the filter environment.
    * @return {boolean} The result of evaluating the filter, cast to a bool.
    */
   checkFilter(recipe, extraContext) {
     let filter = recipe.filter_expression;
     if (!filter || filter === '') {
       return Promise.resolve(true);
-    } else {
-      return EnvExpressions.eval(filter, extraContext)
-      .then(result => {
-        return !!result;
-      })
-      .catch(error => {
-        Log.error(`Error checking filter for "${recipe.name}"`);
-        Log.error(`Filter: "${filter}"`);
-        Log.error(`Error: "${error}"`);
-      });
     }
+    return EnvExpressions.eval(filter, extraContext)
+    .then(result => {
+      return !!result;
+    })
+    .catch(error => {
+      Log.error(`Error checking filter for "${recipe.name}"`);
+      Log.error(`Filter: "${filter}"`);
+      Log.error(`Error: "${error}"`);
+    });
   },
 
   /**
    * Execute a recipe by fetching it action and executing it.
    * @param  {Object} recipe A recipe to execute
    * @promise Resolves when the action has executed
    */
   executeRecipe: Task.async(function* (recipe, extraContext) {