bachir/ouatterrir-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bachir:bab0204ed70004b65defd374666de4ad31984a85
Branches Tags
bachir:master
bachir:prod
bachir:konvajs
..
compare: bachir:cc943c5776b36554b5c40d530c24c93a1c4c61df
Branches Tags
bachir:master
bachir:prod
bachir:konvajs

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

2 changed files with 17 additions and 35 deletions
Show Stats Expand all files Collapse all files

20
src/components/ConcernementMapItem.vue
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,12 +2630,6 @@ 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
document.activeElement.blur();
// setInterval to let time for editable fields to focus out and record changes
let interval = setInterval(() => {
if (!this.concernement_is_updating_nid) {
clearInterval(interval);
this.$router.push({ this.$router.push({
name: 'concernement', name: 'concernement',
params: {cid: this.cid, eid: result.item.item_id}, params: {cid: this.cid, eid: result.item.item_id},
@ -2646,8 +2639,6 @@ export default {
}, },
hash: `#${this.map_mode}`, 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
document.activeElement.blur();
// setInterval to let time for editable fields to focus out and record changes
let interval = setInterval(() => {
if (!this.concernement_is_updating_nid) {
clearInterval(interval);
this.$router.push({ this.$router.push({
name: 'concernement', name: 'concernement',
hash: `#${this.map_mode}`, hash: `#${this.map_mode}`,
params: {id: this.cid, mapitemid: this.id} params: {id: this.cid, mapitemid: this.id}
}); });
}
}, 1)
// reset the mousehover // reset the mousehover
this.resetHoverElmt(); this.resetHoverElmt();

4
src/components/contents/Doleancer.vue
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>