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

fix undefined diff case without breaking void element case

Browse source
This commit is contained in:
Leo Horie 2014-08-16 22:33:16 -04:00
parent 39a0c1e63b
commit f64d861552
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mithril.js
View file

@ -1,6 +1,7 @@
Mithril = m = new function app(window, undefined) { Mithril = m = new function app(window, undefined) {
var type = {}.toString var type = {}.toString
var parser = /(?:(^|#|\.)([^#\.\[\]]+))|(\[.+?\])/g, attrParser = /\[(.+?)(?:=("|'|)(.*?)\2)?\]/ var parser = /(?:(^|#|\.)([^#\.\[\]]+))|(\[.+?\])/g, attrParser = /\[(.+?)(?:=("|'|)(.*?)\2)?\]/
var voidElements = /AREA|BASE|BR|COL|COMMAND|EMBED|HR|IMG|INPUT|KEYGEN|LINK|META|PARAM|SOURCE|TR‌​ACK|WBR/
function m() { function m() {
var args = arguments var args = arguments
@ -163,7 +164,7 @@ Mithril = m = new function app(window, undefined) {
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 != null ? build(node, data.tag, undefined, undefined, data.children, cached.children, true, 0, data.attrs.contenteditable ? node : editable, namespace, configs) : undefined, children: 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,7 +173,7 @@ 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 = data.children != null ? build(node, data.tag, undefined, undefined, data.children, cached.children, false, 0, data.attrs.contenteditable ? node : editable, namespace, configs) : undefined cached.children = 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 && node != null) parentElement.insertBefore(node, parentElement.childNodes[index] || null) if (shouldReattach === true && node != null) parentElement.insertBefore(node, parentElement.childNodes[index] || null)
} }
@ -190,7 +191,7 @@ Mithril = m = new function app(window, undefined) {
} }
else { else {
nodes = [window.document.createTextNode(data)] nodes = [window.document.createTextNode(data)]
parentElement.insertBefore(nodes[0], parentElement.childNodes[index] || null) if (!parentElement.nodeName.match(voidElements)) parentElement.insertBefore(nodes[0], parentElement.childNodes[index] || null)
} }
cached = "string number boolean".indexOf(typeof data) > -1 ? new data.constructor(data) : data cached = "string number boolean".indexOf(typeof data) > -1 ? new data.constructor(data) : data
cached.nodes = nodes cached.nodes = nodes