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

#481 recreate controller if only component type changes

Browse source
This commit is contained in:
Leo Horie 2015-03-11 21:18:13 -04:00
parent 114ebec22f
commit fdbbe7f78f
2 changed files with 53 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mithril.js
View file

@ -234,7 +234,8 @@ var m = (function app(window, undefined) {
else if (data != null && dataType === OBJECT) {
if (data.view) {
var module = data, onunload
var controller = cached.controller || new (module.controller || function() {})
var controllerConstructor = module.controller.$original || module.controller
var controller = controllerConstructor === cached.controllerConstructor ? cached.controller : new (module.controller || function() {})
data = pendingRequests == 0 ? module.view(controller) : {tag: "placeholder"}
if (controller.onunload) unloaders.push({controller: controller, handler: controller.onunload})
if (!data.tag) throw new Error("Component template must return a virtual element, not an array, string, etc.")
@ -270,6 +271,7 @@ var m = (function app(window, undefined) {
nodes: [node]
};
if (controller) {
cached.controllerConstructor = controllerConstructor
cached.controller = controller
if (controller.onunload && controller.onunload.$old) controller.onunload = controller.onunload.$old
if (pendingRequests && controller.onunload) {
@ -289,6 +291,10 @@ var m = (function app(window, undefined) {
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.nodes.intact = true;
if (controller) {
cached.controllerConstructor = controllerConstructor
cached.controller = controller
}
if (shouldReattach === true && node != null) parentElement.insertBefore(node, parentElement.childNodes[index] || null)
}
//schedule configs to be called. They are called after `build` finishes running
@ -527,6 +533,7 @@ var m = (function app(window, undefined) {
if (args[0] && args[0].key != null) template.attrs.key = args[0].key
return template
}
controller.$original = module.controller
var output = {controller: controller, view: view}
if (args[0] && args[0].key != null) output.attrs = {key: args[0].key}
return output