[router] don't mutate RouteResolvers, move a branch out of redraw

This commit is contained in:
Pierre-Yves Gerardy 2016-12-06 21:34:24 +01:00
parent 19729bccdf
commit cf12c00fa1

View file

@ -8,16 +8,16 @@ module.exports = function($window, redrawService) {
var routeService = coreRouter($window)
var identity = function(v) {return v}
var resolver, component, attrs, currentPath, resolve
var render, component, attrs, currentPath, resolve
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) {
resolver = routeResolver, component = comp, attrs = params, currentPath = path, resolve = null
resolver.render = routeResolver.render || identity
render()
component = comp || "div", attrs = params, currentPath = path, resolve = null
render = (routeResolver.render || identity).bind(routeResolver)
run()
}
var render = function() {
if (resolver != null) redrawService.render(root, resolver.render(Vnode(component || "div", attrs.key, attrs)))
var run = function() {
if (render != null) redrawService.render(root, render(Vnode(component, attrs.key, attrs)))
}
routeService.defineRoutes(routes, function(payload, params, path) {
if (payload.view) update({}, payload, params, path)
@ -38,7 +38,7 @@ module.exports = function($window, redrawService) {
}, function() {
routeService.setPath(defaultRoute)
})
redrawService.subscribe(root, render)
redrawService.subscribe(root, run)
}
route.set = routeService.setPath
route.get = function() {return currentPath}