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

Use named arguments in m

Browse source
This commit is contained in:
impinball 2015-07-09 13:17:33 -04:00
parent 34020b1f23
commit c764f8d826
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mithril.js
View file

@ -32,16 +32,16 @@ var m = (function app(window, undefined) {
* @param {...mNode=[]} Zero or more Mithril child nodes. Can be an array, or splat (optional) * @param {...mNode=[]} Zero or more Mithril child nodes. Can be an array, or splat (optional)
* *
*/ */
function m() { function m(tag, attrs) {
var args = [].slice.call(arguments); var args = [].slice.call(arguments, 1);
if (type.call(args[0]) === OBJECT) return parameterize(args[0], args.slice(1)); if (type.call(tag) === OBJECT) return parameterize(tag, args);
var hasAttrs = args[1] != null && type.call(args[1]) === OBJECT && !("tag" in args[1] || "view" in args[1]) && !("subtree" in args[1]); var hasAttrs = attrs != null && type.call(attrs) === OBJECT && !("tag" in attrs || "view" in attrs) && !("subtree" in attrs);
var attrs = hasAttrs ? args[1] : {}; var attrs = hasAttrs ? attrs : {};
var classAttrName = "class" in attrs ? "class" : "className"; var classAttrName = "class" in attrs ? "class" : "className";
var cell = {tag: "div", attrs: {}}; var cell = {tag: "div", attrs: {}};
var match, classes = []; var match, classes = [];
if (type.call(args[0]) != STRING) throw new Error("selector in m(selector, attrs, children) should be a string"); if (type.call(tag) != STRING) throw new Error("selector in m(selector, attrs, children) should be a string");
while (match = parser.exec(args[0])) { while (match = parser.exec(tag)) {
if (match[1] === "" && match[2]) cell.tag = match[2]; if (match[1] === "" && match[2]) cell.tag = match[2];
else if (match[1] === "#") cell.attrs.id = match[2]; else if (match[1] === "#") cell.attrs.id = match[2];
else if (match[1] === ".") classes.push(match[2]); else if (match[1] === ".") classes.push(match[2]);
@ -51,7 +51,7 @@ var m = (function app(window, undefined) {
} }
} }
var children = hasAttrs ? args.slice(2) : args.slice(1); var children = hasAttrs ? args.slice(1) : args;
if (children.length === 1 && type.call(children[0]) === ARRAY) { if (children.length === 1 && type.call(children[0]) === ARRAY) {
cell.children = children[0]; cell.children = children[0];
} }
@ -68,7 +68,7 @@ var m = (function app(window, undefined) {
else cell.attrs[attrName] = attrs[attrName]; else cell.attrs[attrName] = attrs[attrName];
} }
} }
if (classes.length > 0) cell.attrs[classAttrName] = classes.join(" "); if (classes.length) cell.attrs[classAttrName] = classes.join(" ");
return cell; return cell;
} }