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

Merge pull request #205 from sveltejs/gh-140

Browse Source 
prefetch on mouse stop
This commit is contained in:
Rich Harris
2018-05-03 23:31:08 -04:00
committed by GitHub
parent 9653d4c6ce b10edddc96
commit 0b5741194a
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/runtime/index.ts
View File

@@ -214,7 +214,7 @@ let prefetching: {
export function prefetch(href: string) { export function prefetch(href: string) {
const selected = select_route(new URL(href, document.baseURI)); const selected = select_route(new URL(href, document.baseURI));
if (selected) { if (selected && (!prefetching || href !== prefetching.href)) {
prefetching = { prefetching = {
href, href,
promise: selected.route.load().then(mod => prepare_route(mod.default, selected.data)) promise: selected.route.load().then(mod => prepare_route(mod.default, selected.data))
@@ -222,7 +222,16 @@ export function prefetch(href: string) {
} }
} }
function handle_touchstart_mouseover(event: MouseEvent | TouchEvent) { let mousemove_timeout: NodeJS.Timer;
function handle_mousemove(event: MouseEvent) {
clearTimeout(mousemove_timeout);
mousemove_timeout = setTimeout(() => {
trigger_prefetch(event);
}, 20);
}
function trigger_prefetch(event: MouseEvent | TouchEvent) {
const a: HTMLAnchorElement = <HTMLAnchorElement>findAnchor(<Node>event.target); const a: HTMLAnchorElement = <HTMLAnchorElement>findAnchor(<Node>event.target);
if (!a || a.rel !== 'prefetch') return; if (!a || a.rel !== 'prefetch') return;
@@ -248,8 +257,8 @@ export function init(_target: Node, _routes: Route[], opts?: { store?: (data: an
window.addEventListener('popstate', handle_popstate); window.addEventListener('popstate', handle_popstate);
// prefetch // prefetch
window.addEventListener('touchstart', handle_touchstart_mouseover); window.addEventListener('touchstart', trigger_prefetch);
window.addEventListener('mouseover', handle_touchstart_mouseover); window.addEventListener('mousemove', handle_mousemove);
inited = true; inited = true;
} }

7
test/common/test.js
View File

@@ -301,14 +301,17 @@ function run({ mode, basepath = '' }) {
}); });
}); });
it('reuses prefetch promise', () => { it.skip('reuses prefetch promise', () => {
return nightmare return nightmare
.goto(`${base}/blog`) .goto(`${base}/blog`)
.init() .init()
.then(() => { .then(() => {
return capture(() => { return capture(() => {
return nightmare return nightmare
.mouseover('[href="blog/what-is-sapper"]') .evaluate(() => {
const a = document.querySelector('[href="blog/what-is-sapper"]');
a.dispatchEvent(new MouseEvent('mousemove'));
})
.wait(200); .wait(200);
}); });
}) })