From c74e36c238eddd0e546a035930a31f2dfef2c475 Mon Sep 17 00:00:00 2001
From: defcc <chengchao1@gmail.com>
Date: Wed, 14 Dec 2016 00:03:53 +0800
Subject: [PATCH 1/5] omit boolean node

---
 src/core/vdom/helpers/normalize-children.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/vdom/helpers/normalize-children.js b/src/core/vdom/helpers/normalize-children.js
index 3994f180469..79eb45fcdfe 100644
--- a/src/core/vdom/helpers/normalize-children.js
+++ b/src/core/vdom/helpers/normalize-children.js
@@ -28,7 +28,7 @@ function normalizeArrayChildren (children: any, nestedIndex?: string): Array<VNo
         // convert primitive to vnode
         res.push(createTextVNode(c))
       }
-    } else {
+    } else if (c instanceof VNode) {
       if (c.text && last && last.text) {
         res[res.length - 1] = createTextVNode(last.text + c.text)
       } else {

From af4ed91f50b8ad2b4e5f007ffa2c80825eea6c57 Mon Sep 17 00:00:00 2001
From: defcc <chengchao1@gmail.com>
Date: Wed, 14 Dec 2016 00:10:25 +0800
Subject: [PATCH 2/5] add test case

---
 test/unit/modules/vdom/create-element.spec.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/unit/modules/vdom/create-element.spec.js b/test/unit/modules/vdom/create-element.spec.js
index 79a9813a2ce..fd7a715054b 100644
--- a/test/unit/modules/vdom/create-element.spec.js
+++ b/test/unit/modules/vdom/create-element.spec.js
@@ -98,6 +98,17 @@ describe('create-element', () => {
     expect(vnode.children[2].tag).toBe('br')
   })
 
+  it('render vnode with children, including boolean type', () => {
+    const vm = new Vue({})
+    const h = vm.$createElement
+    const vnode = h('p', [h('br'), true, 123, h('br'), 'abc'])
+    expect(vnode.children.length).toBe(4)
+    expect(vnode.children[0].tag).toBe('br')
+    expect(vnode.children[1].text).toBe('123')
+    expect(vnode.children[2].tag).toBe('br')
+    expect(vnode.children[3].text).toBe('abc')
+  })
+
   it('render svg elements with correct namespace', () => {
     const vm = new Vue({})
     const h = vm.$createElement

From aab736e1c0efa76167b24da6f4da79d98edc0987 Mon Sep 17 00:00:00 2001
From: defcc <chengchao1@gmail.com>
Date: Wed, 14 Dec 2016 00:17:47 +0800
Subject: [PATCH 3/5] update boolean type

---
 src/core/vdom/helpers/normalize-children.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/vdom/helpers/normalize-children.js b/src/core/vdom/helpers/normalize-children.js
index 79eb45fcdfe..b682d050e1d 100644
--- a/src/core/vdom/helpers/normalize-children.js
+++ b/src/core/vdom/helpers/normalize-children.js
@@ -16,7 +16,7 @@ function normalizeArrayChildren (children: any, nestedIndex?: string): Array<VNo
   let i, c, last
   for (i = 0; i < children.length; i++) {
     c = children[i]
-    if (c == null) continue
+    if (c == null || typeof c === 'boolean') continue
     last = res[res.length - 1]
     //  nested
     if (Array.isArray(c)) {
@@ -28,7 +28,7 @@ function normalizeArrayChildren (children: any, nestedIndex?: string): Array<VNo
         // convert primitive to vnode
         res.push(createTextVNode(c))
       }
-    } else if (c instanceof VNode) {
+    } else {
       if (c.text && last && last.text) {
         res[res.length - 1] = createTextVNode(last.text + c.text)
       } else {

From 1e8ffc2b14d07abd4b3280dcc8c903afc207b527 Mon Sep 17 00:00:00 2001
From: defcc <chengchao1@gmail.com>
Date: Wed, 14 Dec 2016 00:18:36 +0800
Subject: [PATCH 4/5] update test case

---
 test/unit/modules/vdom/create-element.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/modules/vdom/create-element.spec.js b/test/unit/modules/vdom/create-element.spec.js
index fd7a715054b..ec3e4e4aa0d 100644
--- a/test/unit/modules/vdom/create-element.spec.js
+++ b/test/unit/modules/vdom/create-element.spec.js
@@ -101,7 +101,7 @@ describe('create-element', () => {
   it('render vnode with children, including boolean type', () => {
     const vm = new Vue({})
     const h = vm.$createElement
-    const vnode = h('p', [h('br'), true, 123, h('br'), 'abc'])
+    const vnode = h('p', [h('br'), true, 123, h('br'), 'abc', null])
     expect(vnode.children.length).toBe(4)
     expect(vnode.children[0].tag).toBe('br')
     expect(vnode.children[1].text).toBe('123')

From e7f5eb94cb2656833ea933dd2371f163e94d9a43 Mon Sep 17 00:00:00 2001
From: defcc <chengchao1@gmail.com>
Date: Wed, 14 Dec 2016 00:40:58 +0800
Subject: [PATCH 5/5] update test case

---
 test/unit/modules/vdom/create-element.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/modules/vdom/create-element.spec.js b/test/unit/modules/vdom/create-element.spec.js
index ec3e4e4aa0d..a08c680a5c1 100644
--- a/test/unit/modules/vdom/create-element.spec.js
+++ b/test/unit/modules/vdom/create-element.spec.js
@@ -98,7 +98,7 @@ describe('create-element', () => {
     expect(vnode.children[2].tag).toBe('br')
   })
 
-  it('render vnode with children, including boolean type', () => {
+  it('render vnode with children, including boolean and null type', () => {
     const vm = new Vue({})
     const h = vm.$createElement
     const vnode = h('p', [h('br'), true, 123, h('br'), 'abc', null])