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

Merge pull request #3019 from nikugogoi/dev 

pull request for issue #3018
This commit is contained in:
Sébastien Chopin 2018-03-19 19:15:36 +01:00 committed by GitHub
parent 85d6c5758a 28dede9687
commit f57096e572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/app/client.js
View File

@ -270,11 +270,7 @@ async function render (to, from, next) {
Components.forEach(Component => {
if (!isValid) return
if (typeof Component.options.validate !== 'function') return
isValid = Component.options.validate({
params: to.params || {},
query : to.query || {},
<% if(store) { %>store<% } %>
})
isValid = Component.options.validate(app.context)
})
// ...If .validate() returned false
if (!isValid) {

6
lib/app/server.js
View File

@ -156,11 +156,7 @@ export default async ssrContext => {
Components.forEach((Component) => {
if (!isValid) return
if (typeof Component.options.validate !== 'function') return
isValid = Component.options.validate({
params: app.context.route.params || {},
query: app.context.route.query || {},
<%= (store ? 'store' : '') %>
})
isValid = Component.options.validate(app.context)
})
// ...If .validate() returned false
if (!isValid) {