totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-14 03:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

only navigate if route is found - fixes #279

Browse Source
This commit is contained in:
Rich Harris
2018-06-28 11:45:38 -04:00
parent e87247493f
commit 5c4e4d5d36
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/index.ts
View File

@@ -208,7 +208,11 @@ function handle_popstate(event: PopStateEvent) {
if (event.state) { if (event.state) {
const url = new URL(window.location.href); const url = new URL(window.location.href);
const target = select_route(url); const target = select_route(url);
navigate(target, event.state.id); if (target) {
navigate(target, event.state.id);
} else {
window.location.href = window.location.href;
}
} else { } else {
// hashchange // hashchange
cid = ++uid; cid = ++uid;
@@ -286,7 +290,7 @@ export function init(opts: { App: ComponentConstructor, target: Node, routes: Ro
history.replaceState({ id: uid }, '', href); history.replaceState({ id: uid }, '', href);
const target = select_route(new URL(window.location.href)); const target = select_route(new URL(window.location.href));
return navigate(target, uid); if (target) return navigate(target, uid);
}); });
} }