aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZero~Informatique2020-01-29 23:04:30 +0100
committerZero~Informatique2020-01-30 17:24:07 +0100
commit118666b4c3faeaeaf153a2ea7172764a3cbcffab (patch)
tree75fb4f082b447af11da95f4f4bb18f1f79123167
parent15c806adec22239096a910b92b49fcfb964815bd (diff)
downloadldgallery-118666b4c3faeaeaf153a2ea7172764a3cbcffab.tar.gz
viewer: the loader now correctly waits for the json to be loaded and indexes to be processed before displaying the UI. resolves #61
-rw-r--r--viewer/src/store/galleryStore.ts2
-rw-r--r--viewer/src/views/MainLayout.vue8
2 files changed, 5 insertions, 5 deletions
diff --git a/viewer/src/store/galleryStore.ts b/viewer/src/store/galleryStore.ts
index 663340f..b2ff74e 100644
--- a/viewer/src/store/galleryStore.ts
+++ b/viewer/src/store/galleryStore.ts
@@ -61,7 +61,7 @@ export default class GalleryStore extends VuexModule {
61 61
62 // Fetches the gallery's JSON metadata 62 // Fetches the gallery's JSON metadata
63 @action async fetchGalleryItems(url: string) { 63 @action async fetchGalleryItems(url: string) {
64 fetch(url) 64 return fetch(url)
65 .then(response => response.json()) 65 .then(response => response.json())
66 .then(this.setGalleryItemsRoot) 66 .then(this.setGalleryItemsRoot)
67 .then(this.indexTags); 67 .then(this.indexTags);
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 7a75eb1..f608b9d 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -19,9 +19,9 @@
19 19
20<template> 20<template>
21 <div :class="{fullscreen: $uiStore.fullscreen}"> 21 <div :class="{fullscreen: $uiStore.fullscreen}">
22 <panel-top class="layout layout-top" /> 22 <panel-top v-if="!isLoading" class="layout layout-top" />
23 <panel-left class="layout layout-left" /> 23 <panel-left v-if="!isLoading" class="layout layout-left" />
24 <router-view class="layout layout-content scrollbar" /> 24 <router-view v-if="!isLoading" class="layout layout-content scrollbar" />
25 <b-loading :active="isLoading" is-full-page /> 25 <b-loading :active="isLoading" is-full-page />
26 </div> 26 </div>
27</template> 27</template>
@@ -35,7 +35,7 @@ import PanelTop from "./PanelTop.vue";
35 components: { PanelLeft, PanelTop }, 35 components: { PanelLeft, PanelTop },
36}) 36})
37export default class MainLayout extends Vue { 37export default class MainLayout extends Vue {
38 isLoading: boolean = false; 38 isLoading: boolean = true;
39 39
40 mounted() { 40 mounted() {
41 this.fetchGalleryItems(); 41 this.fetchGalleryItems();