Don't grey out the map during conflict resolution (close #6547)

2026-05-15 21:48:20 +02:00 · 2020-02-05 16:16:50 -05:00
parent 4194194e14
commit 3b19cc32fd
1 changed files with 9 additions and 0 deletions
@@ -357,15 +357,24 @@ export function modeSave(context) {
        loading.close();
        _isSaving = false;

+        context.container().selectAll('#content')
+            .attr('class', 'active');
+
        var ui = uiConflicts(context)
            .conflictList(_conflicts)
            .origChanges(_origChanges)
            .on('cancel', function() {
+                context.container().selectAll('#content')
+                    .attr('class', 'inactive');
+
                history.pop();
                selection.remove();
                keybindingOn();
            })
            .on('save', function() {
+                context.container().selectAll('#content')
+                    .attr('class', 'inactive');
+
                for (var i = 0; i < _conflicts.length; i++) {
                    if (_conflicts[i].chosen === 1) {  // user chose "keep theirs"
                        var entity = context.hasEntity(_conflicts[i].id);