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

Fix #2443 (#2451)

Browse source
This commit is contained in:
Isiah Meadows 2019-07-03 14:41:48 -04:00 • committed by GitHub
parent ddc8adbbd3
commit 86d64e213f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pathname/build.js
View file

@ -33,7 +33,7 @@ module.exports = function(template, params) {
var newPathEnd = newQueryIndex < 0 ? newQueryEnd : newQueryIndex
var result = resolved.slice(0, newPathEnd)
if (queryIndex >= 0) result += "?" + template.slice(queryIndex, queryEnd)
if (queryIndex >= 0) result += template.slice(queryIndex, queryEnd)
if (newQueryIndex >= 0) result += (queryIndex < 0 ? "?" : "&") + resolved.slice(newQueryIndex, newQueryEnd)
var querystring = buildQueryString(query)
if (querystring) result += (queryIndex < 0 && newQueryIndex < 0 ? "?" : "&") + querystring

15
pathname/tests/test-buildPathname.js
View file

@ -101,6 +101,21 @@ o.spec("buildPathname", function() {
o(string).equals(prefix + "/image.png/view")
})
o("merges query strings", function() {
var string = buildPathname(prefix + "/item?a=1&b=2", {c: 3})
o(string).equals(prefix + "/item?a=1&b=2&c=3")
})
o("merges query strings with other parameters", function() {
var string = buildPathname(prefix + "/item/:id?a=1&b=2", {id: "foo", c: 3})
o(string).equals(prefix + "/item/foo?a=1&b=2&c=3")
})
o("consumes template parameters without modifying query string", function() {
var string = buildPathname(prefix + "/item/:id?a=1&b=2", {id: "foo"})
o(string).equals(prefix + "/item/foo?a=1&b=2")
})
}
o.spec("absolute", function() { test("") })
o.spec("relative", function() { test("..") })