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

make controller extend tag

Browse source
This commit is contained in:
Leo Horie 2015-01-24 21:22:51 -05:00
parent dfde6de222
commit 8c112ca468
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mithril.js
View file

@ -231,6 +231,19 @@ var m = (function app(window, undefined) {
} }
} }
else if (data != null && dataType === OBJECT) { else if (data != null && dataType === OBJECT) {
var module = m.tags[data.tag], controller = cached.controller
if (module) {
if (!controller) {
var constructor = module.controller || m.prop()
controller = constructor.call(data, data) || data
}
else {
controller.tag = data.tag
for (var attr in data.attrs) controller.attrs[attr] = data.attrs[attr]
controller.children = data.children
}
data = module.view(controller)
}
if (!data.attrs) data.attrs = {}; if (!data.attrs) data.attrs = {};
if (!cached.attrs) cached.attrs = {}; if (!cached.attrs) cached.attrs = {};
@ -249,14 +262,7 @@ var m = (function app(window, undefined) {
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"; else if (data.tag === "math") namespace = "http://www.w3.org/1998/Math/MathML";
var module = m.tags[data.tag]
if (isNew) { if (isNew) {
if (module) {
var constructor = module.controller || m.prop()
var controller = new constructor(data)
data = module.view(controller)
}
if (data.attrs.is) node = namespace === undefined ? $document.createElement(data.tag, data.attrs.is) : $document.createElementNS(namespace, data.tag, data.attrs.is); if (data.attrs.is) node = namespace === undefined ? $document.createElement(data.tag, data.attrs.is) : $document.createElementNS(namespace, data.tag, data.attrs.is);
else node = namespace === undefined ? $document.createElement(data.tag) : $document.createElementNS(namespace, data.tag); else node = namespace === undefined ? $document.createElement(data.tag) : $document.createElementNS(namespace, data.tag);
cached = { cached = {
@ -268,7 +274,6 @@ var m = (function app(window, undefined) {
data.children, data.children,
nodes: [node] nodes: [node]
}; };
if (module) cached.controller = controller if (module) cached.controller = controller
if (cached.children && !cached.children.nodes) cached.children.nodes = []; if (cached.children && !cached.children.nodes) cached.children.nodes = [];
@ -277,8 +282,6 @@ var m = (function app(window, undefined) {
parentElement.insertBefore(node, parentElement.childNodes[index] || null) parentElement.insertBefore(node, parentElement.childNodes[index] || null)
} }
else { else {
if (cached.controller) data = module.view(cached.controller)
node = cached.nodes[0]; node = cached.nodes[0];
if (hasKeys) setAttributes(node, data.tag, data.attrs, cached.attrs, namespace); if (hasKeys) 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 = build(node, data.tag, undefined, undefined, data.children, cached.children, false, 0, data.attrs.contenteditable ? node : editable, namespace, configs);