From a9f2f299a3d54ff2d485f6f560c75e4e34a16c97 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 10 Jul 2017 03:10:09 +0430 Subject: [PATCH] chore: minor olishes --- lib/app/router.js | 23 ++++++++++------------- lib/app/utils.js | 1 - 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/lib/app/router.js b/lib/app/router.js index cbeb5acec7..55d2a568ca 100644 --- a/lib/app/router.js +++ b/lib/app/router.js @@ -1,5 +1,3 @@ -'use strict' - import Vue from 'vue' import Router from 'vue-router' @@ -7,7 +5,7 @@ Vue.use(Router) <% function recursiveRoutes(routes, tab, components) { - var res = '' + let res = '' routes.forEach((route, i) => { route._name = '_' + hash(route.component) components.push({ _name: route._name, component: route.component, name: route.name }) @@ -20,31 +18,30 @@ function recursiveRoutes(routes, tab, components) { }) return res } -var _components = [] -var _routes = recursiveRoutes(router.routes, '\t\t', _components) -uniqBy(_components, '_name').forEach((route) => { %> -const <%= route._name %> = () => import('<%= relativeToBuild(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */).then(m => m.default || m) +const _components = [] +const _routes = recursiveRoutes(router.routes, '\t\t', _components) +uniqBy(_components, '_name').forEach((route) => { %>const <%= route._name %> = () => import('<%= relativeToBuild(route.component) %>' /* webpackChunkName: "pages/<%= route.name %>" */).then(m => m.default || m) <% }) %> <% if (router.scrollBehavior) { %> const scrollBehavior = <%= serialize(router.scrollBehavior).replace('scrollBehavior(', 'function(') %> <% } else { %> const scrollBehavior = (to, from, savedPosition) => { - // savedPosition is only available for popstate navigations. + // SavedPosition is only available for popstate navigations. if (savedPosition) { return savedPosition } else { let position = {} - // if no children detected + // If no children detected if (to.matched.length < 2) { - // scroll to the top of the page + // Scroll to the top of the page position = { x: 0, y: 0 } } else if (to.matched.some((r) => r.components.default.options.scrollToTop)) { - // if one of the children has scrollToTop option set to true + // If one of the children has scrollToTop option set to true position = { x: 0, y: 0 } } - // if link has anchor, scroll to anchor by returning the selector + // If link has anchor, scroll to anchor by returning the selector if (to.hash) { position = { selector: to.hash } } @@ -61,7 +58,7 @@ export function createRouter () { linkExactActiveClass: '<%= router.linkExactActiveClass %>', scrollBehavior, routes: [ - <%= _routes %> +<%= _routes %> ], fallback: <%= router.fallback %> }) diff --git a/lib/app/utils.js b/lib/app/utils.js index 8260b383d4..0529c9b9bc 100644 --- a/lib/app/utils.js +++ b/lib/app/utils.js @@ -1,4 +1,3 @@ -'use strict' import Vue from 'vue' const noopData = () => ({})