From 5b6b7de045a7060ba8c3edd2ee2f4127aac9de62 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@yo.lk>
Date: Thu, 22 May 2014 16:09:37 +0200
Subject: [PATCH] m.route supports params as an object, and builds querystring
 from it

m.route('/path', {param: 1}) => navigates to '/path?param=1'

The API is a little bit problematic, as it is not possible to combine it with `shouldReplaceHistoryEntry`.
---
 mithril.js             | 21 ++++++++++++---------
 tests/mithril-tests.js | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/mithril.js b/mithril.js
index a87d48a8..00288011 100644
--- a/mithril.js
+++ b/mithril.js
@@ -293,6 +293,9 @@ Mithril = m = new function app(window) {
 		else if (typeof arguments[0] == "string") {
 			currentRoute = arguments[0]
 			var shouldReplaceHistoryEntry = arguments[1] === true
+			var queryString = typeof arguments[1] == "object" ? buildQueryString(arguments[1]) : null
+			if(queryString) currentRoute += (currentRoute.indexOf('?') === -1 ? '?' : '&') + queryString
+
 			if (window.history.pushState) {
 				computePostRedrawHook = function() {
 					window.history[shouldReplaceHistoryEntry ? "replaceState" : "pushState"](null, window.document.title, modes[m.route.mode] + currentRoute)
@@ -337,6 +340,14 @@ Mithril = m = new function app(window) {
 	function scrollToHash() {
 		if (m.route.mode != "hash" && window.location.hash) window.location.hash = window.location.hash
 	}
+	function buildQueryString(object, prefix) {
+		var str = []
+		for(var prop in object) {
+			var key = prefix ? prefix + "[" + prop + "]" : prop, value = object[prop]
+			str.push(typeof value == "object" ? buildQueryString(value, key) : encodeURIComponent(key) + "=" + encodeURIComponent(value))
+		}
+		return str.join("&")
+	}
 	function parseQueryString(str) {
 		var pairs = str.split("&"), params = {};
 		for(var i=0; i < pairs.length; i++) {
@@ -448,18 +459,10 @@ Mithril = m = new function app(window) {
 		xhr.send(options.data)
 		return xhr
 	}
-	function querystring(object, prefix) {
-		var str = []
-		for(var prop in object) {
-			var key = prefix ? prefix + "[" + prop + "]" : prop, value = object[prop]
-			str.push(typeof value == "object" ? querystring(value, key) : encodeURIComponent(key) + "=" + encodeURIComponent(value))
-		}
-		return str.join("&")
-	}
 	function bindData(xhrOptions, data, serialize) {
 		if (data && Object.keys(data).length > 0) {
 			if (xhrOptions.method == "GET") {
-				xhrOptions.url = xhrOptions.url + (xhrOptions.url.indexOf("?") < 0 ? "?" : "&") + querystring(data)
+				xhrOptions.url = xhrOptions.url + (xhrOptions.url.indexOf("?") < 0 ? "?" : "&") + buildQueryString(data)
 			}
 			else xhrOptions.data = serialize(data)
 		}
diff --git a/tests/mithril-tests.js b/tests/mithril-tests.js
index ae034daf..104d5ff4 100644
--- a/tests/mithril-tests.js
+++ b/tests/mithril-tests.js
@@ -635,6 +635,21 @@ function testMithril(mock) {
 		mock.performance.$elapse(50) //teardown
 		return true; mock.location.search == path && paramValue.a == "foo" && paramValue.b.c == "1" && paramValue.b.d == "2" && m.route.param("str") == "bar"
 	})
+	test(function() {
+		mock.performance.$elapse(50) //setup
+		mock.location.search = "?"
+
+		var root = mock.document.createElement("div")
+		m.route.mode = "search"
+		m.route(root, "/", {
+			"/": {controller: function() {}, view: function() {return "bar"}},
+			"/test12": {controller: function() {}, view: function() {return m.route.param("test") + "_" + m.route.param("test2")}}
+		})
+		mock.performance.$elapse(50)
+		m.route("/test12?test=foo", {test2: "bar"})
+		mock.performance.$elapse(50) //teardown
+		return mock.location.search == "?/test12?test=foo&test2=bar" && root.childNodes[0].nodeValue === "foo_bar"
+	})
 	//end m.route
 
 	//m.prop