Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.9.10

This commit is contained in:
Sébastien Chopin 2017-02-18 10:55:36 +01:00
parent 00c9abb806 5b61bd5872
commit 5b22564b10
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app/router.js
View File

@ -54,7 +54,7 @@ const scrollBehavior = (to, from, savedPosition) => {
<% } %> <% } %>
export default new Router({ export default new Router({
mode: 'history', mode: '<%= router.mode %>',
base: '<%= router.base %>', base: '<%= router.base %>',
linkActiveClass: '<%= router.linkActiveClass %>', linkActiveClass: '<%= router.linkActiveClass %>',
scrollBehavior, scrollBehavior,

1
lib/build.js
View File

@ -181,6 +181,7 @@ function * generateRoutesAndFiles () {
uniqBy: _.uniqBy, uniqBy: _.uniqBy,
isDev: this.dev, isDev: this.dev,
router: { router: {
mode: this.options.router.mode,
base: this.options.router.base, base: this.options.router.base,
middleware: this.options.router.middleware, middleware: this.options.router.middleware,
linkActiveClass: this.options.router.linkActiveClass, linkActiveClass: this.options.router.linkActiveClass,

1
lib/nuxt.js
View File

@ -36,6 +36,7 @@ class Nuxt {
mode: 'out-in' mode: 'out-in'
}, },
router: { router: {
mode: 'history',
base: '/', base: '/',
middleware: [], middleware: [],
linkActiveClass: 'nuxt-link-active', linkActiveClass: 'nuxt-link-active',