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

prefetching should not set root preloading value, closes #352

Browse Source
This commit is contained in:
Seth Thompson
2018-08-11 12:26:27 -04:00
parent 99e5a9601c
commit 7cf1b9613a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/runtime/index.ts
View File

@@ -136,10 +136,6 @@ function prepare_page(target: Target): Promise<{
data?: any; data?: any;
nullable_depth?: number; nullable_depth?: number;
}> { }> {
if (root) {
root.set({ preloading: true });
}
const { page, path, query } = target; const { page, path, query } = target;
const new_segments = path.split('/').filter(Boolean); const new_segments = path.split('/').filter(Boolean);
let changed_from = 0; let changed_from = 0;
@@ -219,7 +215,6 @@ function prepare_page(target: Target): Promise<{
return { return {
data: Object.assign({}, props, { data: Object.assign({}, props, {
preloading: false,
child: { child: {
component: manifest.error, component: manifest.error,
props props
@@ -231,7 +226,6 @@ function prepare_page(target: Target): Promise<{
const props = { path, query }; const props = { path, query };
const data = { const data = {
path, path,
preloading: false,
child: Object.assign({}, root_props.child, { child: Object.assign({}, root_props.child, {
segment: segments[0] segment: segments[0]
}) })
@@ -285,6 +279,9 @@ async function navigate(target: Target, id: number): Promise<any> {
cid = id; cid = id;
if (root) {
root.set({ preloading: true });
}
const loaded = prefetching && prefetching.href === target.url.href ? const loaded = prefetching && prefetching.href === target.url.href ?
prefetching.promise : prefetching.promise :
prepare_page(target); prepare_page(target);
@@ -293,6 +290,9 @@ async function navigate(target: Target, id: number): Promise<any> {
const token = current_token = {}; const token = current_token = {};
const { redirect, data, nullable_depth } = await loaded; const { redirect, data, nullable_depth } = await loaded;
if (root) {
root.set({ preloading: false });
}
if (redirect) { if (redirect) {
await goto(redirect.location, { replaceState: true }); await goto(redirect.location, { replaceState: true });