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

Add support for (m.mount + m.route) × (factory + constructible) components

Browse source
This commit is contained in:
Pierre-Yves Gerardy 2017-02-15 21:58:10 +01:00
parent f4fb5ac4be
commit f273b012c9
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/mount.js
View file

@ -10,7 +10,7 @@ module.exports = function(redrawService) {
return return
} }
if (component.view == null) throw new Error("m.mount(element, component) expects a component, not a vnode") if (component.view == null && typeof component !== "function") throw new Error("m.mount(element, component) expects a component, not a vnode")
var run = function() { var run = function() {
redrawService.render(root, Vnode(component)) redrawService.render(root, Vnode(component))

5
api/router.js
View file

@ -21,11 +21,12 @@ module.exports = function($window, redrawService) {
routeService.defineRoutes(routes, function(payload, params, path) { routeService.defineRoutes(routes, function(payload, params, path) {
var update = lastUpdate = function(routeResolver, comp) { var update = lastUpdate = function(routeResolver, comp) {
if (update !== lastUpdate) return if (update !== lastUpdate) return
component = comp != null && typeof comp.view === "function" ? comp : "div", attrs = params, currentPath = path, lastUpdate = null component = comp != null && (typeof comp.view === "function" || typeof comp === "function")? comp : "div"
attrs = params, currentPath = path, lastUpdate = null
render = (routeResolver.render || identity).bind(routeResolver) render = (routeResolver.render || identity).bind(routeResolver)
run() run()
} }
if (payload.view) update({}, payload) if (payload.view || typeof payload === "function") update({}, payload)
else { else {
if (payload.onmatch) { if (payload.onmatch) {
Promise.resolve(payload.onmatch(params, path)).then(function(resolved) { Promise.resolve(payload.onmatch(params, path)).then(function(resolved) {