fix vuejs#5592: comment vnode should not be merged into text vnode. (vuejs#5593)

maggiehe · yyx990803 · commit a8da4fb051bf · 2017-05-07T21:39:04.000+08:00
* comment vnode should not be merged into text vnode.

* add isFalse helper

* delete trailing spaces
diff --git a/src/core/vdom/helpers/normalize-children.js b/src/core/vdom/helpers/normalize-children.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import VNode, { createTextVNode } from 'core/vdom/vnode'
-import { isDef, isUndef, isPrimitive } from 'shared/util'
+import { isFalse, isDef, isUndef, isPrimitive } from 'shared/util'
 
 // The template compiler attempts to minimize the need for normalization by
 // statically analyzing the template at compile time.
@@ -54,7 +54,7 @@ function normalizeArrayChildren (children: any, nestedIndex?: string): Array<VNo
         res.push(createTextVNode(c))
       }
     } else {
-      if (isDef(c.text) && isDef(last) && isDef(last.text)) {
+      if (isFalse(c.isComment) && isDef(c.text) && isDef(last) && isFalse(last.isComment) && isDef(last.text)) {
         res[res.length - 1] = createTextVNode(last.text + c.text)
       } else {
         // default key for nested array children (likely generated by v-for)
diff --git a/src/shared/util.js b/src/shared/util.js
@@ -14,6 +14,9 @@ export function isTrue (v: any): boolean %checks {
   return v === true
 }
 
+export function isFalse (v: any): boolean %checks {
+  return v === false
+}
 /**
  * Check if value is primitive
  */

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ export function isTrue (v: any): boolean %checks {`
`14`	`14`	`return v === true`
`15`	`15`	`}`
`16`	`16`
	`17`	`+export function isFalse (v: any): boolean %checks {`
	`18`	`+ return v === false`
	`19`	`+}`
`17`	`20`	`/**`
`18`	`21`	`* Check if value is primitive`
`19`	`22`	`*/`