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

Merge branch 'next'

Browse source
This commit is contained in:
Leo Horie 2014-08-11 20:54:53 -04:00
commit fb50e6f954
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mithril.js
View file

@ -55,7 +55,7 @@ Mithril = m = new function app(window, undefined) {
var end = offset + (dataType == "[object Array]" ? data : cached.nodes).length var end = offset + (dataType == "[object Array]" ? data : cached.nodes).length
clear(parentCache.nodes.slice(offset, end), parentCache.slice(offset, end)) clear(parentCache.nodes.slice(offset, end), parentCache.slice(offset, end))
} }
else clear(cached.nodes, cached) else if (cached.nodes) clear(cached.nodes, cached)
} }
cached = new data.constructor cached = new data.constructor
cached.nodes = [] cached.nodes = []
@ -107,7 +107,7 @@ Mithril = m = new function app(window, undefined) {
} }
if (change.action == MOVE) { if (change.action == MOVE) {
if (parentElement.childNodes[change.index] !== change.element) { if (parentElement.childNodes[change.index] !== change.element && change.element !== null) {
parentElement.insertBefore(change.element, parentElement.childNodes[change.index]) parentElement.insertBefore(change.element, parentElement.childNodes[change.index])
} }
newCached[change.index] = cached[change.from] newCached[change.index] = cached[change.from]
@ -158,12 +158,13 @@ Mithril = m = new function app(window, undefined) {
var node, isNew = cached.nodes.length === 0 var node, isNew = cached.nodes.length === 0
if (data.attrs.xmlns) namespace = data.attrs.xmlns if (data.attrs.xmlns) namespace = data.attrs.xmlns
else if (data.tag === "svg") namespace = "http://www.w3.org/2000/svg" else if (data.tag === "svg") namespace = "http://www.w3.org/2000/svg"
else if (data.tag === "math") namespace = "http://www.w3.org/1998/Math/MathML"
if (isNew) { if (isNew) {
node = namespace === undefined ? window.document.createElement(data.tag) : window.document.createElementNS(namespace, data.tag) node = namespace === undefined ? window.document.createElement(data.tag) : window.document.createElementNS(namespace, data.tag)
cached = { cached = {
tag: data.tag, tag: data.tag,
//process children before attrs so that select.value works correctly //process children before attrs so that select.value works correctly
children: data.children !== undefined ? build(node, data.tag, undefined, undefined, data.children, cached.children, true, 0, data.attrs.contenteditable ? node : editable, namespace, configs) : undefined, children: data.children !== undefined ? build(node, data.tag, undefined, undefined, data.children, cached.children, true, 0, data.attrs.contenteditable ? node : editable, namespace, configs) : [],
attrs: setAttributes(node, data.tag, data.attrs, {}, namespace), attrs: setAttributes(node, data.tag, data.attrs, {}, namespace),
nodes: [node] nodes: [node]
} }
@ -172,9 +173,9 @@ Mithril = m = new function app(window, undefined) {
else { else {
node = cached.nodes[0] node = cached.nodes[0]
setAttributes(node, data.tag, data.attrs, cached.attrs, namespace) setAttributes(node, data.tag, data.attrs, cached.attrs, namespace)
cached.children = build(node, data.tag, undefined, undefined, data.children, cached.children, false, 0, data.attrs.contenteditable ? node : editable, namespace, configs) cached.children = data.children !== undefined ? build(node, data.tag, undefined, undefined, data.children, cached.children, false, 0, data.attrs.contenteditable ? node : editable, namespace, configs) : []
cached.nodes.intact = true cached.nodes.intact = true
if (shouldReattach === true) parentElement.insertBefore(node, parentElement.childNodes[index] || null) if (shouldReattach === true && node !== null) parentElement.insertBefore(node, parentElement.childNodes[index] || null)
} }
//schedule configs to be called. They are called after `build` finishes running //schedule configs to be called. They are called after `build` finishes running
if (typeof data.attrs["config"] === "function") { if (typeof data.attrs["config"] === "function") {

14
tests/mithril-tests.js
View file

@ -685,6 +685,20 @@ function testMithril(mock) {
m.render(root, m("ul", [m("li", {key: 0}), m("li", {key: 1}), m("li", {key: 2}), m("li", {key: 3}), m("li", {key: 4}), m("li", {key: 5})])) m.render(root, m("ul", [m("li", {key: 0}), m("li", {key: 1}), m("li", {key: 2}), m("li", {key: 3}), m("li", {key: 4}), m("li", {key: 5})]))
return root.childNodes[0].childNodes.map(function(n) {return n.key}).join("") == "012345" return root.childNodes[0].childNodes.map(function(n) {return n.key}).join("") == "012345"
}) })
test(function() {
//https://github.com/lhorie/mithril.js/issues/157
var root = mock.document.createElement("div")
m.render(root, m("input", {value: "a"}))
m.render(root, m("input", {value: "aa"}))
return root.childNodes[0].childNodes.length == 0
})
test(function() {
//https://github.com/lhorie/mithril.js/issues/157
var root = mock.document.createElement("div")
m.render(root, m("br", {class: "a"}))
m.render(root, m("br", {class: "aa"}))
return root.childNodes[0].childNodes.length == 0
})
//end m.render //end m.render
//m.redraw //m.redraw