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

rename RouteResolver::view back to render to restore diff semantics

Browse source 
prevent double resolving
This commit is contained in:
Leo Horie 2016-08-23 22:33:18 -04:00
parent 17161a05c5
commit 53a83a58f2
6 changed files with 185 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
api/router.js
View file

@ -9,13 +9,17 @@ module.exports = function($window, renderer, pubsub) {
var route = function(root, defaultRoute, routes) {
var current = {path: null, component: "div"}
var replay = router.defineRoutes(routes, function(payload, args, path, route) {
var resolved = false
function resolve(component) {
if (resolved) return
resolved = true
current.path = path, current.component = component
renderer.render(root, payload.render(Vnode(component, null, args, undefined, undefined, undefined)))
}
args.path = path, args.route = route
if (typeof payload.onmatch === "function") {
if (typeof payload.view !== "function") payload.view = function(vnode) {return vnode}
var resolve = function(component) {
current.path = path, current.component = component
renderer.render(root, payload.view(Vnode(component, null, args, undefined, undefined, undefined)))
}
if (typeof payload.view !== "function") {
if (typeof payload.render !== "function") payload.render = function(vnode) {return vnode}
if (typeof payload.onmatch !== "function") payload.onmatch = function() {resolve(current.component)}
if (path !== current.path) payload.onmatch(Vnode(payload, null, args, undefined, undefined, undefined), resolve)
else resolve(current.component)
}

125
api/tests/test-router.js
View file

@ -252,7 +252,7 @@ o.spec("route", function() {
resolve(Component)
},
view: function(vnode) {
render: function(vnode) {
renderCount++
o(vnode.attrs.id).equals("abc")
@ -271,7 +271,7 @@ o.spec("route", function() {
}, FRAME_BUDGET)
})
o("accepts RouteResolver without `view` method as payload", function(done) {
o("accepts RouteResolver without `render` method as payload", function(done) {
var matchCount = 0
var Component = {
view: function() {
@ -303,7 +303,7 @@ o.spec("route", function() {
}, FRAME_BUDGET)
})
o("object without `onmatch` method acts as component", function(done) {
o("accepts RouteResolver without `onmatch` method as payload", function(done) {
var renderCount = 0
var Component = {
view: function() {
@ -314,7 +314,7 @@ o.spec("route", function() {
$window.location.href = prefix + "/"
route(root, "/abc", {
"/:id" : {
view: function(vnode) {
render: function(vnode) {
renderCount++
o(vnode.attrs.id).equals("abc")
@ -330,6 +330,44 @@ o.spec("route", function() {
done()
}, FRAME_BUDGET)
})
o("RouteResolver `render` does not have component semantics", function(done, timeout) {
timeout(60)
var renderCount = 0
var A = {
view: function() {
return m("div")
}
}
$window.location.href = prefix + "/"
route(root, "/a", {
"/a" : {
render: function(vnode) {
return m("div")
},
},
"/b" : {
render: function(vnode) {
return m("div")
},
},
})
setTimeout(function() {
var dom = root.firstChild
o(root.firstChild.nodeName).equals("DIV")
route.set("/b")
setTimeout(function() {
o(root.firstChild).equals(dom)
done()
}, FRAME_BUDGET)
}, FRAME_BUDGET)
})
o("calls onmatch and view correct number of times", function(done) {
var matchCount = 0
@ -347,7 +385,7 @@ o.spec("route", function() {
matchCount++
resolve(Component)
},
view: function(vnode) {
render: function(vnode) {
renderCount++
return vnode
},
@ -368,6 +406,83 @@ o.spec("route", function() {
}, FRAME_BUDGET)
})
})
o("onmatch can redirect to another route", function(done) {
var redirected = false
$window.location.href = prefix + "/"
route(root, "/a", {
"/a" : {
onmatch: function() {
route.set("/b")
}
},
"/b" : {
view: function(vnode){
redirected = true
}
}
})
setTimeout(function() {
o(redirected).equals(true)
done()
}, FRAME_BUDGET)
})
o("onmatch can redirect to another route that has RouteResolver", function(done) {
var redirected = false
$window.location.href = prefix + "/"
route(root, "/a", {
"/a" : {
onmatch: function() {
route.set("/b")
}
},
"/b" : {
render: function(vnode){
redirected = true
}
}
})
setTimeout(function() {
o(redirected).equals(true)
done()
}, FRAME_BUDGET)
})
o("onmatch resolution callback resolves at most once", function(done) {
var resolveCount = 0
var resolvedComponent
var A = {view: function() {}}
var B = {view: function() {}}
var C = {view: function() {}}
$window.location.href = prefix + "/"
route(root, "/", {
"/" : {
onmatch: function(vnode, resolve) {
resolve(A)
resolve(B)
callAsync(function() {resolve(C)})
},
render: function(vnode) {
resolveCount++
resolvedComponent = vnode.tag
}
},
})
setTimeout(function() {
o(resolveCount).equals(1)
o(resolvedComponent).equals(A)
done()
}, FRAME_BUDGET)
})
})
})
})