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

normalize arrays

Browse source
This commit is contained in:
Leo Horie 2014-07-11 22:36:58 -04:00
parent 8ff54ccbfd
commit 1e829f1657
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mithril.js
View file

@ -20,7 +20,19 @@ Mithril = m = new function app(window) {
} }
if (classes.length > 0) cell.attrs[classAttrName] = classes.join(" ") if (classes.length > 0) cell.attrs[classAttrName] = classes.join(" ")
cell.children = hasAttrs ? args[2] : args[1] var children = hasAttrs ? args[2] : args[1]
if (children instanceof Array) {
cell.children = []
for (var i = 0; i < children.length; i++) {
var child = children[i]
if (child instanceof Array) children.push.apply(cell.children, child)
else cell.children.push(child)
}
}
else {
cell.children = children
}
for (var attrName in attrs) { for (var attrName in attrs) {
if (attrName == classAttrName) cell.attrs[attrName] = (cell.attrs[attrName] || "") + " " + attrs[attrName] if (attrName == classAttrName) cell.attrs[attrName] = (cell.attrs[attrName] || "") + " " + attrs[attrName]
else cell.attrs[attrName] = attrs[attrName] else cell.attrs[attrName] = attrs[attrName]

11
tests/mithril-tests.js
View file

@ -667,6 +667,17 @@ function testMithril(mock) {
m.render(root, [[], m("div")]) m.render(root, [[], m("div")])
return root.childNodes.length == 1 && root.childNodes[0].nodeName == "DIV" return root.childNodes.length == 1 && root.childNodes[0].nodeName == "DIV"
}) })
test(function() {
//https://github.com/lhorie/mithril.js/issues/156
var root = mock.document.createElement("div")
m.render(root, m("div", [
["a", "b", "c", "d"].map(function() {
return [m("div"), " "]
}),
m("span")
]))
return root.childNodes[0].childNodes[8].nodeName == "SPAN"
})
//end m.render //end m.render
//m.redraw //m.redraw