mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-04-06 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix edit session issue with undo selections enabled

Browse Source
This commit is contained in:
JannisX11 2025-02-14 20:22:39 +01:00
parent 43297d58cd
commit 824000b509
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/undo.js
View File

@ -77,7 +77,7 @@ class UndoSystem {
return entry;
}
initSelection(aspects) {
if (!settings.undo_selections.value || Blockbench.hasFlag('loading_selection_save')) return;
if (!settings.undo_selections.value || Blockbench.hasFlag('loading_selection_save') || Project.EditSession) return;
if (this.current_selection_save) return;
this.current_selection_save = new UndoSystem.selectionSave(aspects);
@ -85,7 +85,7 @@ class UndoSystem {
return this.current_selection_save;
}
finishSelection(message, aspects) {
if (!settings.undo_selections.value || Blockbench.hasFlag('loading_selection_save')) return;
if (!settings.undo_selections.value || Blockbench.hasFlag('loading_selection_save') || Project.EditSession) return;
if (!this.current_selection_save) return;
aspects = aspects || this.current_selection_save.aspects;
@ -198,8 +198,8 @@ class UndoSystem {
if (entry.selection_before instanceof UndoSystem.selectionSave) {
entry.selection_before.load(entry.selection_post);
}
if (Project.EditSession && remote !== true) {
Project.EditSession.sendAll('command', 'undo')
if (Project.EditSession && remote !== true && entry.type != 'selection') {
Project.EditSession.sendAll('command', 'undo');
}
Blockbench.dispatchEvent('undo', {entry})
}
@ -219,8 +219,8 @@ class UndoSystem {
if (entry.selection_post instanceof UndoSystem.selectionSave) {
entry.selection_post.load(entry.selection_before);
}
if (Project.EditSession && remote !== true) {
Project.EditSession.sendAll('command', 'redo')
if (Project.EditSession && remote !== true && entry.type != 'selection') {
Project.EditSession.sendAll('command', 'redo');
}
Blockbench.dispatchEvent('redo', {entry})
}