Merge pull request #1245 from nkovacs/eslint-ternary

fix eslint ternary operator error

.eslintrc

@@ -137,7 +137,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

@@ -31,7 +31,7 @@
   "devDependencies": {
     "casperjs": "^1.1.0-beta3",
     "codecov.io": "^0.1.2",
-    "eslint": "^1.1.0",
+    "eslint": "^1.3.1",
     "grunt": "^0.4.5",
     "grunt-eslint": "^17.1.0",
     "grunt-karma": "^0.12.0",

src/watcher.js

@@ -96,8 +96,8 @@ Watcher.prototype.get = function () {
         'Error when evaluating expression "' +
         this.expression + '". ' +
         (config.debug
-          ? '' :
-          'Turn on debug mode to see stack trace.'
+          ? ''
+          : 'Turn on debug mode to see stack trace.'
         ), e
       )
     }

test/.eslintrc

@@ -147,7 +147,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,