upgrade eslint

Author: yyx990803

.eslintrc

@@ -148,7 +148,7 @@
     "object-shorthand": 0,
     "one-var": [2, { "initialized": "never" }],
     "operator-assignment": 0,
-    "operator-linebreak": [2, "after"],
+    "operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }],
     "padded-blocks": 0,
     "prefer-const": 0,
     "quote-props": 0,

package.json

@@ -39,7 +39,7 @@
     "chromedriver": "2.16.0",
     "css-loader": "^0.16.0",
     "es6-promise": "^3.0.2",
-    "eslint": "^1.1.0",
+    "eslint": "^1.3.1",
     "express": "^4.12.3",
     "html-loader": "^0.3.0",
     "istanbul-instrumenter-loader": "^0.1.3",

test/unit/.eslintrc

@@ -146,7 +146,7 @@
     "object-shorthand": 0,
     "one-var": [2, { "initialized": "never" }],
     "operator-assignment": 0,
-    "operator-linebreak": [2, "after"],
+    "operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }],
     "padded-blocks": 0,
     "prefer-const": 0,
     "quote-props": 0,