vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1516 from tivac/issues/1014

Browse source 
Render false as an empty string
This commit is contained in:
Leo Horie 2017-01-07 15:19:16 -05:00 • committed by GitHub
commit 4fc9368a30
5 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
render/tests/test-component.js
View file

@ -104,7 +104,7 @@ o.spec("component", function() {
visible = false
render(root, [{tag: component}])
o(root.firstChild.nodeValue).equals("false")
o(root.firstChild.nodeValue).equals("")
})
o("updates root from null to null", function() {
var component = {
@ -232,7 +232,7 @@ o.spec("component", function() {
render(root, [{tag: component}])
o(root.firstChild.nodeType).equals(3)
o(root.firstChild.nodeValue).equals("false")
o(root.firstChild.nodeValue).equals("")
})
o("can return null", function() {
var component = {
@ -668,7 +668,7 @@ o.spec("component", function() {
function init(vnode) {
o(vnode.state.data).deepEquals(data)
o(vnode.state.data).equals(data)
//inherits state via prototype
component.x = 1
o(vnode.state.x).equals(1)

12
render/tests/test-hyperscript.js
View file

@ -229,7 +229,7 @@ o.spec("hyperscript", function() {
o("handles falsy boolean single child", function() {
var vnode = m("div", {}, [false])
o(vnode.text).equals(false)
o(vnode.text).equals("")
})
o("handles null single child", function() {
var vnode = m("div", {}, [null])
@ -261,7 +261,7 @@ o.spec("hyperscript", function() {
var vnode = m("div", {}, [false, true])
o(vnode.children[0].tag).equals("#")
o(vnode.children[0].children).equals(false)
o(vnode.children[0].children).equals("")
o(vnode.children[1].tag).equals("#")
o(vnode.children[1].children).equals(true)
})
@ -353,10 +353,16 @@ o.spec("hyperscript", function() {
o(vnode.text).equals(true)
})
o("handles attr and single falsy boolean text child", function() {
var vnode = m("div", {a: "b"}, [0])
o(vnode.attrs.a).equals("b")
o(vnode.text).equals(0)
})
o("handles attr and single false boolean text child", function() {
var vnode = m("div", {a: "b"}, [false])
o(vnode.attrs.a).equals("b")
o(vnode.text).equals(false)
o(vnode.text).equals("")
})
o("handles attr and single text child unwrapped", function() {
var vnode = m("div", {a: "b"}, "c")

4
render/tests/test-normalize.js
View file

@ -48,10 +48,10 @@ o.spec("normalize", function() {
o(node.tag).equals("#")
o(node.children).equals(true)
})
o("normalizes falsy boolean into text node", function() {
o("normalizes falsy boolean into empty text node", function() {
var node = Vnode.normalize(false)
o(node.tag).equals("#")
o(node.children).equals(false)
o(node.children).equals("")
})
})

6
render/tests/test-normalizeChildren.js
View file

@ -16,4 +16,10 @@ o.spec("normalizeChildren", function() {
o(children[0].tag).equals("#")
o(children[0].children).equals("a")
})
o("normalizes `false` values into empty string text nodes", function() {
var children = Vnode.normalizeChildren([false])
o(children[0].tag).equals("#")
o(children[0].children).equals("")
})
})

2
render/vnode.js
View file

@ -3,7 +3,7 @@ function Vnode(tag, key, attrs, children, text, dom) {
}
Vnode.normalize = function(node) {
if (Array.isArray(node)) return Vnode("[", undefined, undefined, Vnode.normalizeChildren(node), undefined, undefined)
if (node != null && typeof node !== "object") return Vnode("#", undefined, undefined, node, undefined, undefined)
if (node != null && typeof node !== "object") return Vnode("#", undefined, undefined, node === false ? "" : node, undefined, undefined)
return node
}
Vnode.normalizeChildren = function normalizeChildren(children) {