totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-19 05:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks

Browse Source
This commit is contained in:
Rich Harris
2018-10-05 20:57:15 -04:00
parent 05b702938f
commit 3f586e19a1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
templates/src/client/app.ts
View File

@@ -106,17 +106,18 @@ export function scroll_state() {
}; };
} }
export function navigate(target: Target, id: number, has_scroll = false): Promise<any> { export function navigate(target: Target, id: number, noscroll = false): Promise<any> {
if (id) { if (id) {
// popstate or initial navigation // popstate or initial navigation
cid = id; cid = id;
} else { } else {
const current_scroll = scroll_state() const current_scroll = scroll_state();
// clicked on a link. preserve scroll state // clicked on a link. preserve scroll state
scroll_history[cid] = current_scroll; scroll_history[cid] = current_scroll;
id = cid = ++uid; id = cid = ++uid;
scroll_history[cid] = has_scroll ? current_scroll : { x: 0, y: 0 }; scroll_history[cid] = noscroll ? current_scroll : { x: 0, y: 0 };
} }
cid = id; cid = id;

4
templates/src/client/start/index.ts
View File

@@ -102,9 +102,9 @@ function handle_click(event: MouseEvent) {
if (url.pathname === location.pathname && url.search === location.search) return; if (url.pathname === location.pathname && url.search === location.search) return;
const target = select_route(url); const target = select_route(url);
const has_scroll = a.hasAttribute('sapper-noscroll')
if (target) { if (target) {
navigate(target, null, has_scroll); const noscroll = a.hasAttribute('sapper-noscroll')
navigate(target, null, noscroll);
event.preventDefault(); event.preventDefault();
history.pushState({ id: cid }, '', url.href); history.pushState({ id: cid }, '', url.href);
} }