cha0s/persea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: no group

Browse Source
This commit is contained in:
cha0s 2022-04-15 12:35:21 -05:00
parent e698a92b17
commit 3b8658144e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/src/server/packets/decorators/action.js
View File

@ -29,7 +29,10 @@ export default (Action, flecks) => class ProjectAction extends Action {
const {group, patch} = json.history.redo.at(-1); const {group, patch} = json.history.redo.at(-1);
socket.send(['Action', patchJsonResource({patch, project, uri}, true)]); socket.send(['Action', patchJsonResource({patch, project, uri}, true)]);
applyPatch(json, patch); applyPatch(json, patch);
json.history.undo.push({group, patch: compare(json, fromBuffer(buffer, flecks))}); json.history.undo.push({
...(group && {group}),
patch: compare(json, fromBuffer(buffer, flecks)),
});
json.history.redo.pop(); json.history.redo.pop();
await writeFile(path, toBuffer(json, flecks)); await writeFile(path, toBuffer(json, flecks));
} }
@ -50,7 +53,10 @@ export default (Action, flecks) => class ProjectAction extends Action {
const {group, patch} = json.history.undo.at(-1); const {group, patch} = json.history.undo.at(-1);
socket.send(['Action', patchJsonResource({patch, project, uri}, true)]); socket.send(['Action', patchJsonResource({patch, project, uri}, true)]);
applyPatch(json, patch); applyPatch(json, patch);
json.history.redo.push({group, patch: compare(json, fromBuffer(buffer, flecks))}); json.history.redo.push({
...(group && {group}),
patch: compare(json, fromBuffer(buffer, flecks)),
});
json.history.undo.pop(); json.history.undo.pop();
await writeFile(path, toBuffer(json, flecks)); await writeFile(path, toBuffer(json, flecks));
} }

3
packages/core/src/server/start-flush.js
View File

@ -29,7 +29,8 @@ const startFlush = (flecks) => {
json.history = json.history || {redo: [], undo: []}; json.history = json.history || {redo: [], undo: []};
json.history.redo = []; json.history.redo = [];
if ( if (
0 === json.history.undo.length !group
|| 0 === json.history.undo.length
|| group !== json.history.undo.at(-1).group || group !== json.history.undo.at(-1).group
) { ) {
json.history.undo.push({group, patch: undo}); json.history.undo.push({group, patch: undo});