Merge pull request #61 from mobify/fix-eslint-for-atom

Fix eslint for Atom

Author: Marlow Payne

CHANGELOG

@@ -1,3 +1,6 @@
+2.2.0
+    - Fixes eslint config to play nicely with Atom's linter-eslint package
+    - Adds an eslint config reset file so that our ruleset is an override
 2.1.1
     - Re-publish to work-around NPM issue
 2.1.0

javascript/.eslintrc

@@ -1,4 +1,5 @@
 {
+    "extends": "./.eslintrc-reset",
     "env": {
         "node": true,
         "browser": true,
@@ -102,17 +103,17 @@
         "no-inner-declarations": 2,
 
         // Disallows the nesting of blocks more than 5 deep
-        "max-depth": [2, "5"],
+        "max-depth": [2, 5],
 
         // Enforces a maximum of 10 parameters in a function declaration
-        "max-params": [2, "10"],
+        "max-params": [2, 10],
 
         // Enforces a maximum of 25 statements within a single function
-        "max-statements": [2, "25"],
+        "max-statements": [2, 25],
 
         // Enforces a maximum of 100 characters in a single line; adjusts tabs
         // to equal 4 characters
-        "max-len": [2, "300", "4"],
+        "max-len": [2, 300, 4],
 
         // Enforces semicolons at the end of statements
         "semi": 2,