Skip to content

Commit

Permalink
move to nuxt org, rename loading to nuxt-loading
Browse files Browse the repository at this point in the history
  • Loading branch information
Atinux committed Nov 9, 2016
1 parent 73bdfc0 commit a5780a0
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion examples/vuex-store/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
10 changes: 5 additions & 5 deletions lib/app/App.vue
Original file line number Diff line number Diff line change
@@ -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 () {
Expand All @@ -34,7 +34,7 @@ export default {
}
},
components: {
ErrorPage<%= (loading ? ',\n\t\tLoading' : '') %>
NuxtError<%= (loading ? ',\n\t\tNuxtLoading' : '') %>
}
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion lib/app/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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"
},
Expand Down

0 comments on commit a5780a0

Please sign in to comment.