From ddeebd758cb7700e5edbf4bd2a48b54181df5382 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Tue, 31 Dec 2024 14:23:57 +0100 Subject: [PATCH] fix(sync): deactivate cancel and hide button when sync is active cf #2265 Let's reactivate when we have a proper undo-redo (cf #1107) --- umap/static/umap/js/modules/ui/bar.js | 4 +++- umap/static/umap/js/modules/umap.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/umap/static/umap/js/modules/ui/bar.js b/umap/static/umap/js/modules/ui/bar.js index c08f327c..80202616 100644 --- a/umap/static/umap/js/modules/ui/bar.js +++ b/umap/static/umap/js/modules/ui/bar.js @@ -145,7 +145,9 @@ export class TopBar extends WithTemplate { } redraw() { - this.elements.peers.hidden = !this._umap.getProperty('syncEnabled') + const syncEnabled = this._umap.getProperty('syncEnabled') + this.elements.peers.hidden = !syncEnabled + this.elements.cancel.hidden = syncEnabled this.elements.saveLabel.hidden = this._umap.permissions.isDraft() this.elements.saveDraftLabel.hidden = !this._umap.permissions.isDraft() } diff --git a/umap/static/umap/js/modules/umap.js b/umap/static/umap/js/modules/umap.js index f1e8541a..57ffc46b 100644 --- a/umap/static/umap/js/modules/umap.js +++ b/umap/static/umap/js/modules/umap.js @@ -1259,6 +1259,7 @@ export default class Umap extends ServerStored { } askForReset(e) { + if (this.getProperty('syncEnabled')) return this.dialog .confirm(translate('Are you sure you want to cancel your changes?')) .then(() => {