Compare commits

..

No commits in common. "bab0204ed70004b65defd374666de4ad31984a85" and "cc943c5776b36554b5c40d530c24c93a1c4c61df" have entirely different histories.

2 changed files with 17 additions and 35 deletions

View File

@ -87,8 +87,7 @@ export default {
'detailsZoomValue', 'detailsZoomValue',
'reloadConcernements', 'reloadConcernements',
'reloadConcernementEntites', 'reloadConcernementEntites',
'concernements_loading_nb', 'concernements_loading_nb']),
'concernement_is_updating_nid']),
...mapState(CommonStore,['hover_elmt', ...mapState(CommonStore,['hover_elmt',
'map_item_ray', 'map_item_ray',
'cartouch_width', 'cartouch_width',
@ -2631,23 +2630,15 @@ export default {
case "superposition": case "superposition":
case "action": case "action":
// we have clicked on an entite // we have clicked on an entite
// unfocus any active element to trigger recording if needed this.$router.push({
document.activeElement.blur(); name: 'concernement',
// setInterval to let time for editable fields to focus out and record changes params: {cid: this.cid, eid: result.item.item_id},
let interval = setInterval(() => { query: {
if (!this.concernement_is_updating_nid) { mapitemid: this.id,
clearInterval(interval); // superposition_id: this.mapitem.superposition_ids[0]
this.$router.push({ },
name: 'concernement', hash: `#${this.map_mode}`,
params: {cid: this.cid, eid: result.item.item_id}, });
query: {
mapitemid: this.id,
// superposition_id: this.mapitem.superposition_ids[0]
},
hash: `#${this.map_mode}`,
});
}
}, 1)
break; break;
case "proximite": case "proximite":
switch (result.item.item_type) { switch (result.item.item_type) {
@ -2678,20 +2669,11 @@ export default {
} else { } else {
// otherwise we close the entite and come back to the concernement // otherwise we close the entite and come back to the concernement
// unfocus any active element to trigger recording if needed this.$router.push({
document.activeElement.blur(); name: 'concernement',
// setInterval to let time for editable fields to focus out and record changes hash: `#${this.map_mode}`,
let interval = setInterval(() => { params: {id: this.cid, mapitemid: this.id}
if (!this.concernement_is_updating_nid) { });
clearInterval(interval);
this.$router.push({
name: 'concernement',
hash: `#${this.map_mode}`,
params: {id: this.cid, mapitemid: this.id}
});
}
}, 1)
// reset the mousehover // reset the mousehover
this.resetHoverElmt(); this.resetHoverElmt();

View File

@ -1203,13 +1203,13 @@ export default {
<!-- <vue-plyr> <!-- <vue-plyr>
<div class="plyr__video-embed"> --> <div class="plyr__video-embed"> -->
<!-- <iframe <iframe
v-if="!opened_concernement.opened_doleance || opened_concernement.opened_doleance.field === 'leprobleme' || opened_concernement.opened_doleance.field === 'lenquete'" v-if="!opened_concernement.opened_doleance || opened_concernement.opened_doleance.field === 'leprobleme' || opened_concernement.opened_doleance.field === 'lenquete'"
src="https://www.youtube.com/embed/_Uogb4tJ9c4?amp;iv_load_policy=3&amp;modestbranding=1&amp;playsinline=1&amp;showinfo=0&amp;rel=0&amp;enablejsapi=1" src="https://www.youtube.com/embed/_Uogb4tJ9c4?amp;iv_load_policy=3&amp;modestbranding=1&amp;playsinline=1&amp;showinfo=0&amp;rel=0&amp;enablejsapi=1"
allowfullscreen allowfullscreen
allowtransparency allowtransparency
frameborder="0" frameborder="0"
></iframe> --> ></iframe>
<!-- </div> <!-- </div>
</vue-plyr> --> </vue-plyr> -->
</template> </template>