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

#466 allow modules as second parameter of m

Browse source
This commit is contained in:
Leo Horie 2015-02-24 17:53:49 -05:00
parent 971b0def51
commit c81294bce8
2 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mithril.js
View file

@ -33,7 +33,7 @@ var m = (function app(window, undefined) {
*/
function m() {
var args = [].slice.call(arguments);
var hasAttrs = args[1] != null && type.call(args[1]) === OBJECT && !("tag" in args[1]) && !("subtree" in args[1]);
var hasAttrs = args[1] != null && type.call(args[1]) === OBJECT && !("tag" in args[1] || "view" in args[1]) && !("subtree" in args[1]);
var attrs = hasAttrs ? args[1] : {};
var classAttrName = "class" in attrs ? "class" : "className";
var cell = {tag: "div", attrs: {}};
@ -58,7 +58,7 @@ var m = (function app(window, undefined) {
else {
cell.children = children
}
for (var attrName in attrs) {
if (attrName === classAttrName) {
if (attrs[attrName] !== "") cell.attrs[attrName] = (cell.attrs[attrName] || "") + " " + attrs[attrName];
@ -232,7 +232,7 @@ var m = (function app(window, undefined) {
}
}
else if (data != null && dataType === OBJECT) {
if (data.controller) {
if (data.view) {
var module = data
var controller = cached.controller || new (module.controller || function() {})
if (controller.onunload) unloaders.push({controller: controller, handler: controller.onunload})