Skip to content

Update normalize children (fix 4466) #4468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 13, 2016
Merged

Update normalize children (fix 4466) #4468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c74e36c
omit boolean node
defcc Dec 13, 2016
af4ed91
add test case
defcc Dec 13, 2016
aab736e
update boolean type
defcc Dec 13, 2016
1e8ffc2
update test case
defcc Dec 13, 2016
e7f5eb9
update test case
defcc Dec 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/vdom/helpers/normalize-children.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
11 changes: 11 additions & 0 deletions test/unit/modules/vdom/create-element.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,17 @@ describe('create-element', () => {
expect(vnode.children[2].tag).toBe('br')
})

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])
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
Expand Down