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

Bundled output for commit 53a83a58f2 [skip ci]

Browse source
This commit is contained in:
Gandalf-the-Bot 2016-08-24 02:34:16 +00:00
parent 53a83a58f2
commit 3d515af736
2 changed files with 52 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mithril.js
View file

@ -166,8 +166,7 @@ var renderService = function($window) {
initLifecycle(vnode.tag, vnode, hooks)
vnode.instance = Vnode.normalize(vnode.tag.view.call(vnode.state, vnode))
if (vnode.instance != null) {
if(vnode.instance === vnode)
throw Error("A component view mustn't return the vnode that was supplied to it.")
if (vnode.instance === vnode) throw Error("A view cannot return the vnode it received as arguments")
var element = createNode(vnode.instance, hooks, ns)
vnode.dom = vnode.instance.dom
vnode.domSize = vnode.dom != null ? vnode.instance.domSize : 0
@ -1100,13 +1099,17 @@ m.route = 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)
}