Merge pull request vuejs#1245 from nkovacs/eslint-ternary

yyx990803 · yyx990803 · commit 1fa16a067d9c · 2015-09-03T11:28:19.000-04:00
fix eslint ternary operator error
diff --git a/.eslintrc b/.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,
diff --git a/package.json b/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",
diff --git a/src/watcher.js b/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
       )
     }
diff --git a/test/.eslintrc b/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,

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ Watcher.prototype.get = function () {`
`96`	`96`	`'Error when evaluating expression "' +`
`97`	`97`	`this.expression + '". ' +`
`98`	`98`	`(config.debug`
`99`		`- ? '' :`
`100`		`- 'Turn on debug mode to see stack trace.'`
	`99`	`+ ? ''`
	`100`	`+ : 'Turn on debug mode to see stack trace.'`
`101`	`101`	`), e`
`102`	`102`	`)`
`103`	`103`	`}`