diff options
| author | Zero~Informatique | 2020-02-13 18:17:35 +0100 |
|---|---|---|
| committer | Zero~Informatique | 2020-02-13 18:17:35 +0100 |
| commit | 6c51a97bce7963fba47892602c1214b3bcdcd410 (patch) | |
| tree | 0df87fda5a480718cf35b6087555039a706df524 /viewer/src/views | |
| parent | 9c2af5dcd2d2c8754e4c74e02141822c0964a5a8 (diff) | |
| parent | ef1778e051e007f08f9188a479d04fdf95a57d21 (diff) | |
| download | ldgallery-6c51a97bce7963fba47892602c1214b3bcdcd410.tar.gz | |
Merge branch 'oz-config-json' into develop
# Conflicts:
# scripts/win_compile_example.cmd
Diffstat (limited to 'viewer/src/views')
| -rw-r--r-- | viewer/src/views/MainLayout.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue index 12388a9..63a1b83 100644 --- a/viewer/src/views/MainLayout.vue +++ b/viewer/src/views/MainLayout.vue | |||
| @@ -60,7 +60,8 @@ export default class MainLayout extends Vue { | |||
| 60 | fetchGalleryItems() { | 60 | fetchGalleryItems() { |
| 61 | this.isLoading = true; | 61 | this.isLoading = true; |
| 62 | this.$galleryStore | 62 | this.$galleryStore |
| 63 | .fetchGalleryItems(`${process.env.VUE_APP_DATA_URL}index.json`) | 63 | .fetchConfig() |
| 64 | .then(this.$galleryStore.fetchGalleryItems) | ||
| 64 | .finally(() => (this.isLoading = false)) | 65 | .finally(() => (this.isLoading = false)) |
| 65 | .catch(this.displayError); | 66 | .catch(this.displayError); |
| 66 | } | 67 | } |