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

more router fixes

Browse source
This commit is contained in:
Leo Horie 2016-12-07 07:57:58 -05:00
parent b4f1f35c54
commit f1f52445ec
3 changed files with 190 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/router.js
View file

@ -12,13 +12,16 @@ module.exports = function($window, redrawService) {
var route = function(root, defaultRoute, routes) {
if (root == null) throw new Error("Ensure the DOM element that was passed to `m.route` is not undefined")
var update = function(routeResolver, comp, params, path) {
component = comp || "div", attrs = params, currentPath = path, resolve = null
component = comp != null && typeof comp.view === "function" ? comp : "div", attrs = params, currentPath = path, resolve = null
render = (routeResolver.render || identity).bind(routeResolver)
run()
}
var run = function() {
if (render != null) redrawService.render(root, render(Vnode(component, attrs.key, attrs)))
}
var bail = function() {
routeService.setPath(defaultRoute)
}
routeService.defineRoutes(routes, function(payload, params, path) {
if (payload.view) update({}, payload, params, path)
else {
@ -30,14 +33,12 @@ module.exports = function($window, redrawService) {
}
Promise.resolve(payload.onmatch(params, path)).then(function(resolved) {
if (resolve != null) resolve(resolved)
})
}, bail)
}
}
else update(payload, "div", params, path)
}
}, function() {
routeService.setPath(defaultRoute)
})
}, bail)
redrawService.subscribe(root, run)
}
route.set = function(path, data, options) {