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

[router] remove logic made redundant by promise use

Browse source
This commit is contained in:
Pierre-Yves Gerardy 2016-12-06 21:44:49 +01:00
parent cf12c00fa1
commit 650f7c4f3b
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
api/router.js
View file

@ -8,11 +8,11 @@ module.exports = function($window, redrawService) {
var routeService = coreRouter($window) var routeService = coreRouter($window)
var identity = function(v) {return v} var identity = function(v) {return v}
var render, component, attrs, currentPath, resolve var render, component, attrs, currentPath
var route = function(root, defaultRoute, routes) { 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") 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) { var update = function(routeResolver, comp, params, path) {
component = comp || "div", attrs = params, currentPath = path, resolve = null component = comp || "div", attrs = params, currentPath = path
render = (routeResolver.render || identity).bind(routeResolver) render = (routeResolver.render || identity).bind(routeResolver)
run() run()
} }
@ -23,15 +23,9 @@ module.exports = function($window, redrawService) {
if (payload.view) update({}, payload, params, path) if (payload.view) update({}, payload, params, path)
else { else {
if (payload.onmatch) { if (payload.onmatch) {
if (resolve != null) update(payload, component, params, path) Promise.resolve(payload.onmatch(params, path)).then(function(resolved) {
else { update(payload, resolved, params, path)
resolve = function(resolved) { })
update(payload, resolved, params, path)
}
Promise.resolve(payload.onmatch(params, path)).then(function(resolved) {
if (resolve != null) resolve(resolved)
})
}
} }
else update(payload, "div", params, path) else update(payload, "div", params, path)
} }