Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 08:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify fix and cover other Promise checks

Browse Source
This commit is contained in:
taldy 2017-04-06 12:09:56 +03:00
parent 93c4be2d28
commit c22b0b790b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/app/client.js
View File

@ -166,7 +166,7 @@ function render (to, from, next) {
}
if (Component.options.fetch) {
var p = Component.options.fetch(context)
if (!(p instanceof Promise)) { p = Promise.resolve(p) }
if (!p || (!(p instanceof Promise) && (typeof p.then !== 'function'))) { p = Promise.resolve(p) }
<%= (loading ? 'p.then(() => this.$loading.increase && this.$loading.increase(30))' : '') %>
promises.push(p)
}
@ -318,7 +318,7 @@ function addHotReload ($component, depth) {
// Call fetch()
Component.options.fetch = Component.options.fetch || noopFetch
let pFetch = Component.options.fetch(context)
if (!(pFetch instanceof Promise)) { pFetch = Promise.resolve(pFetch) }
if (!pFetch || (!(pFetch instanceof Promise) && (typeof pFetch.then !== 'function'))) { pFetch = Promise.resolve(pFetch) }
<%= (loading ? 'pFetch.then(() => this.$loading.increase && this.$loading.increase(30))' : '') %>
promises.push(pFetch)
return Promise.all(promises)

2
lib/app/server.js
View File

@ -81,7 +81,7 @@ export default context => {
// nuxtServerInit
<% if (store) { %>
let promise = (store._actions && store._actions.nuxtServerInit ? store.dispatch('nuxtServerInit', omit(getContext(context), 'redirect', 'error')) : null)
if (!promise || (!(promise instanceof Promise) && (promise && typeof promise.then !== 'function'))) promise = Promise.resolve()
if (!promise || (!(promise instanceof Promise) && (typeof promise.then !== 'function'))) promise = Promise.resolve()
<% } else { %>
let promise = Promise.resolve()
<% } %>

2
lib/app/utils.js
View File

@ -84,7 +84,7 @@ export function promisify (fn, context) {
} else {
promise = fn(context)
}
if (!(promise instanceof Promise)) {
if (!promise || (!(promise instanceof Promise) && (typeof promise.then !== 'function')))
promise = Promise.resolve(promise)
}
return promise

2
lib/utils.js
View File

@ -52,7 +52,7 @@ export function promisifyRoute (fn) {
})
}
let promise = fn()
if (!(promise instanceof Promise)) {
if (!promise || (!(promise instanceof Promise) && (typeof promise.then !== 'function')))
promise = Promise.resolve(promise)
}
return promise