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

#1579 prevent infinite loop in non-existent default route

Browse source
This commit is contained in:
Leo 2017-02-03 22:21:14 -05:00
parent 5faa996805
commit 9d5f686bbd
5 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mithril.js
View file

@ -1056,7 +1056,6 @@ var coreRouter = function($window) {
var path = router.getPath()
var params = {}
var pathname = parsePath(path, params, params)
var state = $window.history.state
if (state != null) {
for (var k in state) params[k] = state[k]
@ -1077,12 +1076,10 @@ var coreRouter = function($window) {
}
reject(path, params)
}
if (supportsPushState) $window.onpopstate = debounceAsync(resolveRoute)
else if (router.prefix.charAt(0) === "#") $window.onhashchange = resolveRoute
resolveRoute()
}
return router
}
var _20 = function($window, redrawService0) {
@ -1094,8 +1091,9 @@ var _20 = function($window, redrawService0) {
var run1 = function() {
if (render1 != null) redrawService0.render(root, render1(Vnode(component, attrs3.key, attrs3)))
}
var bail = function() {
routeService.setPath(defaultRoute, null, {replace: true})
var bail = function(path) {
if (path !== defaultRoute) routeService.setPath(defaultRoute, null, {replace: true})
else throw new Error("Could not resolve default route " + defaultRoute)
}
routeService.defineRoutes(routes, function(payload, params, path) {
var update = lastUpdate = function(routeResolver, comp) {