terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

lib/router: improve aborting xhr

Browse source
This commit is contained in:
nkzawa 2016-10-09 20:01:06 +09:00
parent 3e721b6878
commit a8c6b9e57a
1 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/router.js
View file

@ -120,20 +120,13 @@ export default class Router {
const route = toRoute(parse(url).pathname)
let data = this.components[route]
if (data) return data
if (!data) {
let cancel
let cancelled = false
const componentUrl = toJSONUrl(route)
data = await new Promise((resolve, reject) => {
this.componentLoadCancel = cancel = () => {
cancelled = true
if (xhr.abort) xhr.abort()
const err = new Error('Cancelled')
err.cancelled = true
reject(err)
}
const xhr = loadComponent(componentUrl, (err, data) => {
@ -146,15 +139,8 @@ export default class Router {
this.componentLoadCancel = null
}
// we update the cache even if cancelled
if (data) this.components[route] = data
if (cancelled) {
const err = new Error('Cancelled')
err.cancelled = true
throw err
this.components[route] = data
}
return data
}
@ -242,6 +228,11 @@ function loadJSON (url, fn) {
xhr.onerror = () => {
fn(new Error('XHR failed. Status: ' + xhr.status))
}
xhr.onabort = () => {
const err = new Error('XHR aborted')
err.cancelled = true
fn(err)
}
xhr.open('GET', url)
xhr.send()