Merge branch 'next' of github.com:claydotio/zorium.js into claydotio-next

Conflicts:
	mithril.js
	tests/mithril-tests.js

mithril.js

@@ -3,8 +3,21 @@ Mithril = m = new function app(window, undefined) {
 	var parser = /(?:(^|#|\.)([^#\.\[\]]+))|(\[.+?\])/g, attrParser = /\[(.+?)(?:=("|'|)(.*?)\2)?\]/
 	var voidElements = /AREA|BASE|BR|COL|COMMAND|EMBED|HR|IMG|INPUT|KEYGEN|LINK|META|PARAM|SOURCE|TR‌​ACK|WBR/
 
+	/*
+	 * @typedef {String} Tag
+	 * A string that looks like -> div.classname#id[param=one][param2=two]
+	 * Which describes a DOM node
+	 */
+
+	/*
+	 *
+	 * @param {Tag} The DOM node tag
+	 * @param {Object=[]} optional key-value pairs to be mapped to DOM attrs
+	 * @param {...mNode=[]} Zero or more Mithril child nodes. Can be an array, or splat (optional)
+	 *
+	 */
 	function m() {
-		var args = arguments
+		var args = Array.prototype.slice.call(arguments, 0)
 		var hasAttrs = args[1] != null && type.call(args[1]) == "[object Object]" && !("tag" in args[1]) && !("subtree" in args[1])
 		var attrs = hasAttrs ? args[1] : {}
 		var classAttrName = "class" in attrs ? "class" : "className"
@@ -21,7 +34,14 @@ Mithril = m = new function app(window, undefined) {
 		}
 		if (classes.length > 0) cell.attrs[classAttrName] = classes.join(" ")
 
-		cell.children = hasAttrs ? args[2] : args[1]
+
+		var children = hasAttrs ? args[2] : args[1]
+		if (children instanceof Array) {
+			cell.children = children
+		}
+		else {
+			cell.children = hasAttrs ? args.slice(2) : args.slice(1)
+		}
 
 		for (var attrName in attrs) {
 			if (attrName == classAttrName) cell.attrs[attrName] = (cell.attrs[attrName] || "") + " " + attrs[attrName]
@@ -197,7 +217,7 @@ Mithril = m = new function app(window, undefined) {
 			//schedule configs to be called. They are called after `build` finishes running
 			if (typeof data.attrs["config"] === "function") {
 				var context = cached.configContext = cached.configContext || {}
-				
+
 				// bind
 				var callback = function(data, args) {
 					return function() {
@@ -800,12 +820,12 @@ Mithril = m = new function app(window, undefined) {
 		if (options.dataType && options.dataType.toLowerCase() === "jsonp") {
 			var callbackKey = "mithril_callback_" + new Date().getTime() + "_" + (Math.round(Math.random() * 1e16)).toString(36);
 			var script = window.document.createElement("script");
-			
+
 			window[callbackKey] = function(resp){
 				delete window[callbackKey];
 				window.document.body.removeChild(script);
 				options.onload({ type: "load", target: {
-					responseText: resp 
+					responseText: resp
 				} });
 			};
 
@@ -826,7 +846,7 @@ Mithril = m = new function app(window, undefined) {
 				e.preventDefault();
 				e.stopPropagation();
 			};
-			
+
 
 			script.src = options.url
 				+ (options.url.indexOf("?") > 0 ? "&" : "?")

tests/mithril-tests.js

@@ -9,16 +9,19 @@ function testMithril(mock) {
 	test(function() {return m("[title=bar]").attrs.title === "bar"})
 	test(function() {return m("[title=\'bar\']").attrs.title === "bar"})
 	test(function() {return m("[title=\"bar\"]").attrs.title === "bar"})
-	test(function() {return m("div", "test").children === "test"})
+	test(function() {return m("div", "test").children[0] === "test"})
+	test(function() {return m("div", "test", "test2").children[1] === "test2"})
 	test(function() {return m("div", ["test"]).children[0] === "test"})
 	test(function() {return m("div", {title: "bar"}, "test").attrs.title === "bar"})
-	test(function() {return m("div", {title: "bar"}, "test").children === "test"})
+	test(function() {return m("div", {title: "bar"}, "test").children[0] === "test"})
 	test(function() {return m("div", {title: "bar"}, ["test"]).children[0] === "test"})
-	test(function() {return m("div", {title: "bar"}, m("div")).children.tag === "div"})
+	test(function() {return m("div", {title: "bar"}, m("div")).children[0].tag === "div"})
 	test(function() {return m("div", {title: "bar"}, [m("div")]).children[0].tag === "div"})
+	test(function() {return m("div", {title: "bar"}, "test0", "test1", "test2", "test3").children[3] === "test3"}) // splat
+	test(function() {return m("div", {title: "bar"}, m("div"), m("i"), m("span")).children[2].tag === "span"})
 	test(function() {return m("div", ["a", "b"]).children.length === 2})
 	test(function() {return m("div", [m("div")]).children[0].tag === "div"})
-	test(function() {return m("div", m("div")).children.tag === "div"}) //yes, this is expected behavior: see method signature
+	test(function() {return m("div", m("div")).children[0].tag === "div"}) //yes, this is expected behavior: see method signature
 	test(function() {return m("div", [undefined]).tag === "div"})
 	test(function() {return m("div", [{foo: "bar"}])}) //as long as it doesn't throw errors, it's fine
 	test(function() {return m("svg", [m("g")])})
@@ -723,7 +726,7 @@ function testMithril(mock) {
 	test(function() {
 		//https://github.com/lhorie/mithril.js/issues/200
 		var root = mock.document.createElement("div")
-		
+
 		var unloaded1 = false
 		function unloadable1(element, isInit, context) {
 			context.onunload = function() {
@@ -732,7 +735,7 @@ function testMithril(mock) {
 		}
 		m.render(root, [ m("div", {config: unloadable1}) ])
 		m.render(root, [ ])
-		
+
 		var unloaded2 = false
 		function unloadable2(element, isInit, context) {
 			context.onunload = function() {
@@ -741,7 +744,7 @@ function testMithril(mock) {
 		}
 		m.render(root, [ m("div", {config: unloadable2}) ])
 		m.render(root, [ ])
-		
+
 		return unloaded1 === true && unloaded2 === true
 	})
 	test(function() {
@@ -1555,7 +1558,7 @@ function testMithril(mock) {
 		xhr.onreadystatechange()
 		return xhr.$headers["Content-Type"] == "application/json; charset=utf-8"
 	})
-	
+
 	// m.request over jsonp
 	test(function(){
 		// script tags cannot be appended directly on the document
@@ -1621,7 +1624,7 @@ function testMithril(mock) {
 			_window[callbackKeys[0]](out);
 			mock.document.body.removeChild(scriptTag);
 			delete _window[callbackKeys[0]];
-		}		
+		}
 		mock.document.removeChild(body);
 		return JSON.stringify(out) === JSON.stringify(req());
 	})