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

implement this.redirect in preload (#83)

Browse Source
This commit is contained in:
Rich Harris
2018-02-17 22:56:47 -05:00
parent f8ea9ebda1
commit bff6f550be
7 changed files with 71 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/runtime/index.ts
View File

@@ -74,17 +74,23 @@ function render(Component: ComponentConstructor, data: any, scroll: ScrollPositi
}
function prepare_route(Component: ComponentConstructor, data: RouteData) {
let redirect: { statusCode: number, location: string } = null;
if (!Component.preload) {
return { Component, data };
return { Component, data, redirect };
}
if (!component && window.__SAPPER__ && window.__SAPPER__.preloaded) {
return { Component, data: Object.assign(data, window.__SAPPER__.preloaded) };
return { Component, data: Object.assign(data, window.__SAPPER__.preloaded), redirect };
}
return Promise.resolve(Component.preload(data)).then(preloaded => {
return Promise.resolve(Component.preload.call({
redirect: (statusCode: number, location: string) => {
redirect = { statusCode, location };
}
}, data)).then(preloaded => {
Object.assign(data, preloaded)
return { Component, data };
return { Component, data, redirect };
});
}
@@ -110,7 +116,8 @@ function navigate(target: Target, id: number) {
const token = current_token = {};
return loaded.then(({ Component, data }) => {
return loaded.then(({ Component, data, redirect }) => {
if (redirect) return goto(redirect.location, { replaceState: true });
render(Component, data, scroll_history[id], token);
});
}