archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fire the route cancelled error right away. (#1312)

Browse source 
Earlier it wait until the JSON page is fetched.
But that's wrong and it affects when using libs like NProgress.
This commit is contained in:
Arunoda Susiripala 2017-02-28 14:18:40 +05:30 committed by Tim Neutkens
parent fd430e53bf
commit 818cd63ee9
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/router/router.js
View file

@ -70,11 +70,11 @@ export default class Router extends EventEmitter {
return
}
this.abortComponentLoad()
const { url, as } = e.state
const { pathname, query } = parse(url, true)
this.abortComponentLoad(as)
if (!this.urlIsNew(pathname, query)) {
this.emit('routeChangeStart', as)
this.emit('routeChangeComplete', as)
@ -91,7 +91,6 @@ export default class Router extends EventEmitter {
} = await this.getRouteInfo(route, pathname, query, as)
if (error && error.cancelled) {
this.emit('routeChangeError', error, as)
return
}
@ -132,7 +131,6 @@ export default class Router extends EventEmitter {
} = await this.getRouteInfo(route, pathname, query, url)
if (error && error.cancelled) {
this.emit('routeChangeError', error, url)
return
}
@ -159,7 +157,7 @@ export default class Router extends EventEmitter {
}
async change (method, url, as) {
this.abortComponentLoad()
this.abortComponentLoad(as)
const { pathname, query } = parse(url, true)
// If asked to change the current URL we should reload the current page
@ -178,7 +176,6 @@ export default class Router extends EventEmitter {
} = await this.getRouteInfo(route, pathname, query, as)
if (error && error.cancelled) {
this.emit('routeChangeError', error, as)
return false
}
@ -331,7 +328,8 @@ export default class Router extends EventEmitter {
})
}
abortComponentLoad () {
abortComponentLoad (as) {
this.emit('routeChangeError', new Error('Route Cancelled'), as)
if (this.componentLoadCancel) {
this.componentLoadCancel()
this.componentLoadCancel = null