mirror of
https://github.com/nuxt/nuxt.git
synced 2025-02-16 21:58:19 +00:00
move to nuxt org, rename loading to nuxt-loading
This commit is contained in:
parent
73bdfc0394
commit
a5780a09ca
@ -72,4 +72,4 @@ export default {
|
||||
|
||||
## Context
|
||||
|
||||
To see the list of available keys in `context`, take a look at [this documentation](https://github.com/Atinux/nuxt.js/tree/master/examples/async-data#context).
|
||||
To see the list of available keys in `context`, take a look at [this documentation](https://github.com/nuxt/nuxt.js/tree/master/examples/async-data#context).
|
||||
|
@ -1,14 +1,14 @@
|
||||
<template>
|
||||
<div id="app">
|
||||
<% if (loading) { %><loading ref="loading"></loading><% } %>
|
||||
<% if (loading) { %><nuxt-loading ref="loading"></nuxt-loading><% } %>
|
||||
<router-view v-if="!err"></router-view>
|
||||
<error-page v-if="err" :error="err"></error-page>
|
||||
<nuxt-error v-if="err" :error="err"></nuxt-error>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ErrorPage from '<%= components.ErrorPage %>'
|
||||
<% if (loading) { %>import Loading from '<%= (typeof loading === "string" ? loading : "./components/Loading.vue") %>'<% } %>
|
||||
import NuxtError from '<%= components.ErrorPage %>'
|
||||
<% if (loading) { %>import NuxtLoading from '<%= (typeof loading === "string" ? loading : "./components/Loading.vue") %>'<% } %>
|
||||
|
||||
export default {
|
||||
data () {
|
||||
@ -34,7 +34,7 @@ export default {
|
||||
}
|
||||
},
|
||||
components: {
|
||||
ErrorPage<%= (loading ? ',\n\t\tLoading' : '') %>
|
||||
NuxtError<%= (loading ? ',\n\t\tNuxtLoading' : '') %>
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
@ -172,7 +172,7 @@ Promise.all(resolveComponents)
|
||||
router.beforeEach(render.bind(_app))
|
||||
// Call window.onModulesLoaded for jsdom testing (https://github.com/tmpvar/jsdom#dealing-with-asynchronous-script-loading)
|
||||
if (typeof window.onNuxtReady === 'function') {
|
||||
window.onNuxtReady()
|
||||
window.onNuxtReady(_app)
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
|
@ -1,10 +1,10 @@
|
||||
{
|
||||
"name": "nuxt",
|
||||
"version": "0.2.4",
|
||||
"version": "0.2.5",
|
||||
"description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
|
||||
"main": "index.js",
|
||||
"license": "MIT",
|
||||
"repository": "Atinux/nuxt.js",
|
||||
"repository": "nuxt/nuxt.js",
|
||||
"bin": {
|
||||
"nuxt": "./bin/nuxt"
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user