From 43d9d66e5d9c983dc151371c6e3bb2500a80579f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Mon, 24 Jan 2022 18:36:16 +0100
Subject: [PATCH] fix loaders
---
src/views/project/Project_detail.vue | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/views/project/Project_detail.vue b/src/views/project/Project_detail.vue
index 9aa6a388..f1a1dc65 100644
--- a/src/views/project/Project_detail.vue
+++ b/src/views/project/Project_detail.vue
@@ -1,14 +1,7 @@
<template>
<div v-frag>
<div
- v-if="loading"
- :class="{ active: loading }"
- class="ui inverted dimmer"
- >
- <div class="ui loader" />
- </div>
- <div
- v-else-if="permissions && permissions.can_view_project && project"
+ v-if="permissions && permissions.can_view_project && project"
v-frag
>
<div
@@ -306,7 +299,7 @@
project &&
permissions &&
permissions.can_create_feature_type &&
- isOffline() != true
+ isOffline() !== true
"
:to="{
name: 'editer-symbologie-signalement',
@@ -791,7 +784,6 @@ export default {
data() {
return {
- loading: false,
infoMessage: '',
importMessage: null,
arraysOffline: [],
@@ -808,7 +800,6 @@ export default {
featureTypeToDelete: null,
featuresLoading: true,
isFileSizeModalOpen: false,
- // mapFeatures: null,
mapLoading: true,
};
},
@@ -987,13 +978,13 @@ export default {
},
retrieveProjectInfo() {
- this.loading = true;
+ this.$store.commit('DISPLAY_LOADER', 'Projet en cours de chargement.');
Promise.all([
this.GET_PROJECT(this.slug),
this.GET_PROJECT_INFO(this.slug)
])
.then(() => {
- this.loading = false;
+ this.$store.commit('DISCARD_LOADER');
this.projectInfoLoading = false;
setTimeout(() => {
let map = mapUtil.getMap();
@@ -1003,7 +994,7 @@ export default {
})
.catch((err) => {
console.error(err);
- this.loading = false;
+ this.$store.commit('DISCARD_LOADER');
this.projectInfoLoading = false;
});
},
@@ -1335,8 +1326,4 @@ export default {
.centered-text {
text-align: center;
}
-
-.dimmer {
- height: calc(100vh - 61px - 40px);
-}
</style>
--
GitLab