Merge pull request vuejs#2137 from rhyzx/fix-terminal-directives-check

yyx990803 · yyx990803 · commit 742c92c51c46 · 2016-01-10T01:36:42.000-05:00
allow empty expression in terminal directives
diff --git a/src/compiler/compile.js b/src/compiler/compile.js
@@ -587,11 +587,10 @@ function checkTerminalDirectives (el, options) {
   var value, dirName
   for (var i = 0, l = terminalDirectives.length; i < l; i++) {
     dirName = terminalDirectives[i]
-    /* eslint-disable no-cond-assign */
-    if (value = el.getAttribute('v-' + dirName)) {
+    value = el.getAttribute('v-' + dirName)
+    if (value != null) {
       return makeTerminalNodeLinkFn(el, dirName, value, options)
     }
-    /* eslint-enable no-cond-assign */
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -587,11 +587,10 @@ function checkTerminalDirectives (el, options) {`
`587`	`587`	`var value, dirName`
`588`	`588`	`for (var i = 0, l = terminalDirectives.length; i < l; i++) {`
`589`	`589`	`dirName = terminalDirectives[i]`
`590`		`- /* eslint-disable no-cond-assign */`
`591`		`- if (value = el.getAttribute('v-' + dirName)) {`
	`590`	`+ value = el.getAttribute('v-' + dirName)`
	`591`	`+ if (value != null) {`
`592`	`592`	`return makeTerminalNodeLinkFn(el, dirName, value, options)`
`593`	`593`	`}`
`594`		`- /* eslint-enable no-cond-assign */`
`595`	`594`	`}`
`596`	`595`	`}`
`597`	`596`