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

scope config stack to m.render call

Browse source
This commit is contained in:
Leo Horie 2014-06-06 18:23:20 -04:00
parent 33ac4fc7d1
commit 8bba1dc9d9
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mithril.js
View file

@ -32,8 +32,7 @@ Mithril = m = new function app(window) {
} }
return cell return cell
} }
var configs = [] function build(parentElement, parentTag, parentCache, parentIndex, data, cached, shouldReattach, index, editable, namespace, configs) {
function build(parentElement, parentTag, parentCache, parentIndex, data, cached, shouldReattach, index, editable, namespace) {
if (data === null || data === undefined) data = "" if (data === null || data === undefined) data = ""
if (data.subtree === "retain") return if (data.subtree === "retain") return
@ -52,8 +51,9 @@ Mithril = m = new function app(window) {
if (dataType == "[object Array]") { if (dataType == "[object Array]") {
var nodes = [], intact = cached.length === data.length, subArrayCount = 0 var nodes = [], intact = cached.length === data.length, subArrayCount = 0
for (var i = 0, cacheCount = 0; i < data.length; i++) { for (var i = 0, cacheCount = 0; i < data.length; i++) {
var item = build(parentElement, null, cached, index, data[i], cached[cacheCount], shouldReattach, index + subArrayCount || subArrayCount, editable, namespace) var item = build(parentElement, null, cached, index, data[i], cached[cacheCount], shouldReattach, index + subArrayCount || subArrayCount, editable, namespace, configs)
if (item === undefined) continue if (item === undefined) continue
if (!item.nodes.intact) intact = false if (!item.nodes.intact) intact = false
subArrayCount += item instanceof Array ? item.length : 1 subArrayCount += item instanceof Array ? item.length : 1
@ -85,7 +85,7 @@ Mithril = m = new function app(window) {
cached = { cached = {
tag: data.tag, tag: data.tag,
attrs: setAttributes(node, data.tag, data.attrs, {}, namespace), attrs: setAttributes(node, data.tag, data.attrs, {}, namespace),
children: data.children !== undefined ? build(node, data.tag, undefined, undefined, data.children, cached.children, true, 0, data.attrs.contenteditable ? node : editable, namespace) : undefined, children: data.children !== undefined ? build(node, data.tag, undefined, undefined, data.children, cached.children, true, 0, data.attrs.contenteditable ? node : editable, namespace, configs) : undefined,
nodes: [node] nodes: [node]
} }
parentElement.insertBefore(node, parentElement.childNodes[index] || null) parentElement.insertBefore(node, parentElement.childNodes[index] || null)
@ -93,7 +93,7 @@ Mithril = m = new function app(window) {
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) 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) parentElement.insertBefore(node, parentElement.childNodes[index] || null) if (shouldReattach === true) parentElement.insertBefore(node, parentElement.childNodes[index] || null)
} }
@ -222,13 +222,13 @@ Mithril = m = new function app(window) {
} }
var nodeCache = [], cellCache = {} var nodeCache = [], cellCache = {}
m.render = function(root, cell) { m.render = function(root, cell) {
var configs = []
if (!root) throw new Error("Please ensure the DOM element exists before rendering a template into it.") if (!root) throw new Error("Please ensure the DOM element exists before rendering a template into it.")
var index = nodeCache.indexOf(root) var index = nodeCache.indexOf(root)
var id = index < 0 ? nodeCache.push(root) - 1 : index var id = index < 0 ? nodeCache.push(root) - 1 : index
var node = root == window.document || root == window.document.documentElement ? documentNode : root var node = root == window.document || root == window.document.documentElement ? documentNode : root
cellCache[id] = build(node, null, undefined, undefined, cell, cellCache[id], false, 0, null, undefined) cellCache[id] = build(node, null, undefined, undefined, cell, cellCache[id], false, 0, null, undefined, configs)
for (var i = 0; i < configs.length; i++) configs[i]() for (var i = 0; i < configs.length; i++) configs[i]()
configs.length = 0
} }
m.trust = function(value) { m.trust = function(value) {

13
tests/mithril-tests.js
View file

@ -487,6 +487,19 @@ function testMithril(mock) {
}))); })));
return parent === root return parent === root
}) })
test(function() {
var root = mock.document.createElement("div")
var count = 0
m.render(root, m("div", m("a", {
config: function(el) {
var island = mock.document.createElement("div")
count++
if (count > 2) throw "too much recursion..."
m.render(island, m("div"))
}
})));
return count == 1
})
//end m.render //end m.render
//m.redraw //m.redraw