diff --git a/examples/custom-routes/pages/comments/index.vue b/examples/custom-routes/pages/comments/index.vue deleted file mode 100644 index b5ec94880d..0000000000 --- a/examples/custom-routes/pages/comments/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/examples/custom-routes/pages/posts/_slug/comments.vue b/examples/custom-routes/pages/posts/_slug/comments.vue new file mode 100644 index 0000000000..62cdad11f6 --- /dev/null +++ b/examples/custom-routes/pages/posts/_slug/comments.vue @@ -0,0 +1,5 @@ + diff --git a/examples/custom-routes/old/_user.vue b/examples/custom-routes/pages/users/_id.vue similarity index 74% rename from examples/custom-routes/old/_user.vue rename to examples/custom-routes/pages/users/_id.vue index 874e37d718..f0de965bdd 100644 --- a/examples/custom-routes/old/_user.vue +++ b/examples/custom-routes/pages/users/_id.vue @@ -1,9 +1,10 @@ @@ -22,9 +23,14 @@ export default { diff --git a/lib/app/router.js b/lib/app/router.js index ef8061ad85..0ce1e29778 100644 --- a/lib/app/router.js +++ b/lib/app/router.js @@ -16,7 +16,6 @@ function recursiveRoutes(routes, tab) { res += tab + '\tcomponent: ' + route._name res += (route.name) ? ',\n\t' + tab + 'name: ' + JSON.stringify(route.name) : '' res += (route.alias) ? ',\n\t' + tab + 'alias: ' + JSON.stringify(route.alias) : '' - res += (route.redirect) ? ',\n\t' + tab + 'redirect: ' + JSON.stringify(route.redirect) : '' res += (route.meta) ? ',\n\t' + tab + 'meta: ' + JSON.stringify(route.meta) : '' res += (route.children) ? ',\n\t' + tab + 'children: [\n' + recursiveRoutes(routes[i].children, tab + '\t\t') + '\n\t' + tab + ']' : '' res += '\n' + tab + '}' + (i + 1 === routes.length ? '' : ',\n') @@ -33,8 +32,11 @@ const scrollBehavior = (to, from, savedPosition) => { // savedPosition is only available for popstate navigations. return savedPosition } else { - // Scroll to the top by default - let position = { x: 0, y: 0 } + let position = {} + // if no children detected + if (to.matched.length < 2) { + position = { x: 0, y: 0 } + } // if link has anchor, scroll to anchor by returning the selector if (to.hash) { position = { selector: to.hash }