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

App.vue: check resolvedLayouts in setLayout

Browse Source
This commit is contained in:
Wu Haotian 2017-08-07 15:11:47 +08:00
parent 4abbb4eb9c
commit e686844b03
No known key found for this signature in database
GPG Key ID: 9A146A3AA793AACB
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/app/App.vue
View File

@ -35,14 +35,14 @@ export default {
<% } %> <% } %>
methods: { methods: {
setLayout (layout) { setLayout (layout) {
if (!layout || !layouts['_' + layout]) layout = 'default' if (!layout || !resolvedLayouts['_' + layout]) layout = 'default'
this.layoutName = layout this.layoutName = layout
let _layout = '_' + layout let _layout = '_' + layout
this.layout = layouts[_layout] this.layout = resolvedLayouts[_layout]
return this.layout return this.layout
}, },
loadLayout (layout) { loadLayout (layout) {
if (!layout || !layouts['_' + layout]) layout = 'default' if (!layout || !(layouts['_' + layout] || resolvedLayouts['_' + layout])) layout = 'default'
let _layout = '_' + layout let _layout = '_' + layout
if (resolvedLayouts[_layout]) { if (resolvedLayouts[_layout]) {
return Promise.resolve(resolvedLayouts[_layout]) return Promise.resolve(resolvedLayouts[_layout])