Merge branch 'master' of github.com:nuxt/nuxt.js

This commit is contained in:
Sebastien Chopin 2017-04-06 12:28:38 +02:00
commit 9c16c0d3f2
2 changed files with 2 additions and 2 deletions

View File

@ -130,7 +130,7 @@ function render (to, from, next) {
if (typeof Component.options.validate !== 'function') return
isValid = Component.options.validate({
params: to.params || {},
query: to.query || {}
query : to.query || {}<%= (store ? ', store: context.store' : '') %>
})
})
if (!isValid) {

View File

@ -153,7 +153,7 @@ export default context => {
if (typeof Component.options.validate !== 'function') return
isValid = Component.options.validate({
params: context.route.params || {},
query: context.route.query || {}
query: context.route.query || {}<%= (store ? ', store: ctx.store' : '') %>
})
})
if (!isValid) {