commit
50a4b6fd01
3 changed files with 16 additions and 4 deletions
|
|
@ -548,7 +548,7 @@ Mithril = m = new function app(window, undefined) {
|
||||||
var context = arguments[2]
|
var context = arguments[2]
|
||||||
if (!isInitialized) {
|
if (!isInitialized) {
|
||||||
context.href = element.getAttribute("href")
|
context.href = element.getAttribute("href")
|
||||||
element.href = window.location.pathname + modes[m.route.mode] + context.href
|
element.href = (m.route.mode !== 'pathname' ? window.location.pathname : '') + modes[m.route.mode] + context.href
|
||||||
element.removeEventListener("click", routeUnobtrusive)
|
element.removeEventListener("click", routeUnobtrusive)
|
||||||
element.addEventListener("click", routeUnobtrusive)
|
element.addEventListener("click", routeUnobtrusive)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -861,10 +861,20 @@ function testMithril(mock) {
|
||||||
var root = mock.document.createElement("div")
|
var root = mock.document.createElement("div")
|
||||||
m.route.mode = "pathname"
|
m.route.mode = "pathname"
|
||||||
m.route(root, "/test2", {
|
m.route(root, "/test2", {
|
||||||
"/test2": {controller: function() {}, view: function() {return "foo"}}
|
"/test2": {
|
||||||
|
controller: function() {},
|
||||||
|
view: function() {
|
||||||
|
return [
|
||||||
|
"foo",
|
||||||
|
m("a", { href: "/test2", config: m.route }, "Test2")
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
mock.requestAnimationFrame.$resolve() //teardown
|
mock.requestAnimationFrame.$resolve() //teardown
|
||||||
return mock.location.pathname == "/test2" && root.childNodes[0].nodeValue === "foo"
|
return mock.location.pathname == "/test2" &&
|
||||||
|
root.childNodes[0].nodeValue === "foo" &&
|
||||||
|
root.childNodes[1].href == "/test2"
|
||||||
})
|
})
|
||||||
test(function() {
|
test(function() {
|
||||||
mock.requestAnimationFrame.$resolve() //setup
|
mock.requestAnimationFrame.$resolve() //setup
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,9 @@ mock.window = new function() {
|
||||||
},
|
},
|
||||||
getAttribute: function(name, value) {
|
getAttribute: function(name, value) {
|
||||||
return this[name]
|
return this[name]
|
||||||
}
|
},
|
||||||
|
addEventListener: function () {},
|
||||||
|
removeEventListener: function () {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
window.document.createElementNS = function(namespace, tag) {
|
window.document.createElementNS = function(namespace, tag) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue