This commit is contained in:
Sebastien Chopin 2017-08-21 13:54:41 +02:00
parent d1a6b2bc80
commit fed644ddf6

View File

@ -36,7 +36,7 @@ Vue.config.errorHandler = function (err, vm, info) {
err.message = err.message || err.toString()
// Show Nuxt Error Page
if(vm && vm.$root && vm.$root.$nuxt && vm.$root.$nuxt.error && info !== 'render function') {
if(vm && vm.$root && vm.$root.$nuxt && vm.$root.$nuxt.error && info !== 'render function') {
vm.$root.$nuxt.error(err)
}
@ -280,7 +280,7 @@ async function render (to, from, next) {
await Promise.all(Components.map((Component, i) => {
// Check if only children route changed
Component._path = compile(to.matched[i].path)(to.params)
if (!this._hadError && Component._path === _lastPaths[i] && (i + 1) !== Components.length) {
if (!this._hadError && this._isMounted && Component._path === _lastPaths[i] && (i + 1) !== Components.length) {
return Promise.resolve()
}