rename RouteResolver::view back to render to restore diff semantics
prevent double resolving
This commit is contained in:
parent
17161a05c5
commit
53a83a58f2
6 changed files with 185 additions and 48 deletions
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue