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`.
This commit is contained in:
parent
001263080e
commit
5b6b7de045
2 changed files with 27 additions and 9 deletions
21
mithril.js
21
mithril.js
|
|
@ -293,6 +293,9 @@ Mithril = m = new function app(window) {
|
||||||
else if (typeof arguments[0] == "string") {
|
else if (typeof arguments[0] == "string") {
|
||||||
currentRoute = arguments[0]
|
currentRoute = arguments[0]
|
||||||
var shouldReplaceHistoryEntry = arguments[1] === true
|
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) {
|
if (window.history.pushState) {
|
||||||
computePostRedrawHook = function() {
|
computePostRedrawHook = function() {
|
||||||
window.history[shouldReplaceHistoryEntry ? "replaceState" : "pushState"](null, window.document.title, modes[m.route.mode] + currentRoute)
|
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() {
|
function scrollToHash() {
|
||||||
if (m.route.mode != "hash" && window.location.hash) window.location.hash = window.location.hash
|
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) {
|
function parseQueryString(str) {
|
||||||
var pairs = str.split("&"), params = {};
|
var pairs = str.split("&"), params = {};
|
||||||
for(var i=0; i < pairs.length; i++) {
|
for(var i=0; i < pairs.length; i++) {
|
||||||
|
|
@ -448,18 +459,10 @@ Mithril = m = new function app(window) {
|
||||||
xhr.send(options.data)
|
xhr.send(options.data)
|
||||||
return xhr
|
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) {
|
function bindData(xhrOptions, data, serialize) {
|
||||||
if (data && Object.keys(data).length > 0) {
|
if (data && Object.keys(data).length > 0) {
|
||||||
if (xhrOptions.method == "GET") {
|
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)
|
else xhrOptions.data = serialize(data)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -635,6 +635,21 @@ function testMithril(mock) {
|
||||||
mock.performance.$elapse(50) //teardown
|
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"
|
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
|
//end m.route
|
||||||
|
|
||||||
//m.prop
|
//m.prop
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue