From b5c5744bc79d99e75629085ccafedd8f50c41916 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Fri, 15 Jul 2016 07:49:57 -0400
Subject: Updating ESLint (#3597)

---
 webapp/.eslintrc.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'webapp/.eslintrc.json')

diff --git a/webapp/.eslintrc.json b/webapp/.eslintrc.json
index dada7f164..ad28561f1 100644
--- a/webapp/.eslintrc.json
+++ b/webapp/.eslintrc.json
@@ -59,6 +59,7 @@
         "keyword-spacing": [2, {"before": true, "after": true, "overrides": {}}],
         "linebreak-style": 2,
         "lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }],
+        "max-lines": [1, {"max": 450, "skipBlankLines": true, "skipComments": false}],
         "max-nested-callbacks": [1, {"max":1}],
         "max-nested-callbacks": [2, {"max":2}],
         "max-statements-per-line": [2, {"max": 1}],
@@ -92,6 +93,7 @@
         "no-extend-native": 2,
         "no-extra-bind": 2,
         "no-extra-label": 2,
+        "no-extra-parens": 0,
         "no-extra-semi": 2,
         "no-fallthrough": 2,
         "no-floating-decimal": 2,
@@ -107,6 +109,7 @@
         "no-lonely-if": 2,
         "no-loop-func": 2,
         "no-magic-numbers": [1, { "ignore": [-1, 0, 1, 2], "enforceConst": true, "detectObjects": true } ],
+        "no-mixed-operators": [2, {"allowSamePrecedence": false}],
         "no-mixed-spaces-and-tabs": 2,
         "no-multi-spaces": [2, { "exceptions": { "Property": false } }],
         "no-multi-str": 0,
@@ -152,13 +155,16 @@
         "no-useless-concat": 2,
         "no-useless-constructor": 2,
         "no-useless-escape": 2,
+        "no-useless-rename": 2,
         "no-var": 0,
         "no-void": 2,
         "no-warning-comments": 1,
         "no-whitespace-before-property": 2,
         "no-with": 2,
+        "object-curly-newline": 0, 
         "object-curly-spacing": [2, "never"],
-        "object-shorthand": [1, "always"],
+        "object-property-newline": [2, {"allowMultiplePropertiesPerLine": true}],
+        "object-shorthand": [2, "always"],
         "one-var": [2, "never"],
         "one-var-declaration-per-line": 0,
         "operator-linebreak": [2, "after"],
@@ -189,9 +195,11 @@
         "react/jsx-no-target-blank": 2,
         "react/jsx-no-undef": 2,
         "react/jsx-pascal-case": 2,
+        "react/jsx-filename-extension": 2,
         "react/jsx-space-before-closing": [2, "never"],
         "react/jsx-uses-react": 2,
         "react/jsx-uses-vars": 2,
+        "react/no-comment-textnodes": 2,
         "react/no-danger": 0,
         "react/no-deprecated": 2,
         "react/no-did-mount-set-state": 2,
@@ -199,17 +207,20 @@
         "react/no-direct-mutation-state": 2,
         "react/no-is-mounted": 2,
         "react/no-multi-comp": [2, { "ignoreStateless": true }],
+        "react/no-render-return-value": 2,
         "react/no-set-state": 0,
         "react/no-string-refs": 0,
         "react/no-unknown-property": 2,
         "react/prefer-es6-class": 2,
         "react/prefer-stateless-function": 0,
         "react/prop-types": 2,
+        "react/require-optimization": 1,
         "react/require-render-return": 2,
         "react/self-closing-comp": 2,
         "react/sort-comp": 0,
         "react/wrap-multilines": 2,
         "require-yield": 2,
+        "rest-spread-spacing": [2, "never"],
         "semi": [2, "always"],
         "semi-spacing": [2, {"before": false, "after": true}],
         "sort-imports": 0,
-- 
cgit v1.2.3-1-g7c22