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

prevent race condition between route.set and async resolve

Browse source 
remove path and route from attrs
This commit is contained in:
Leo Horie 2016-08-26 00:56:01 -04:00
parent a1a087c4be
commit 00d555b9f4
2 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/router.js
View file

@ -7,16 +7,15 @@ var autoredraw = require("../api/autoredraw")
module.exports = function($window, renderer, pubsub) {
var router = coreRouter($window)
var route = function(root, defaultRoute, routes) {
var current = {path: null, component: "div"}
var current = {path: null, component: "div", resolver: null}, currentResolutionIdentifier = null
var replay = router.defineRoutes(routes, function(payload, args, path, route) {
var resolved = false
var resolutionIdentifier = currentResolutionIdentifier = {}
function resolve(component) {
if (resolved) return
resolved = true
if (resolutionIdentifier !== currentResolutionIdentifier) return
resolutionIdentifier = null
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.view !== "function") {
if (typeof payload.render !== "function") payload.render = function(vnode) {return vnode}
if (typeof payload.onmatch !== "function") payload.onmatch = function() {resolve(current.component)}

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

@ -240,8 +240,7 @@ o.spec("route", function() {
matchCount++
o(vnode.attrs.id).equals("abc")
o(vnode.attrs.path).equals("/abc")
o(vnode.attrs.route).equals("/:id")
o(route.get()).equals("/abc")
resolve(Component)
},
@ -279,8 +278,7 @@ o.spec("route", function() {
matchCount++
o(vnode.attrs.id).equals("abc")
o(vnode.attrs.path).equals("/abc")
o(vnode.attrs.route).equals("/:id")
o(route.get()).equals("/abc")
resolve(Component)
},
@ -457,7 +455,7 @@ o.spec("route", function() {
$window.location.href = prefix + "/"
route(root, "/", {
"/" : {
"/": {
onmatch: function(vnode, resolve) {
resolve(A)
resolve(B)
@ -476,6 +474,33 @@ o.spec("route", function() {
done()
}, FRAME_BUDGET)
})
o("calling route.set invalidates pending onmatch resolution", function(done, timeout) {
timeout(100)
var resolved
$window.location.href = prefix + "/"
route(root, "/a", {
"/a": {
onmatch: function(vnode, resolve) {
setTimeout(resolve, 20)
},
render: function(vnode) {resolved = "a"}
},
"/b": {
view: function() {resolved = "b"}
}
})
setTimeout(function() {
route.set("/b")
setTimeout(function() {
o(resolved).equals("b")
done()
}, 30)
}, FRAME_BUDGET)
})
})
})
})