gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-04 08:58:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

make sure the sorted branches are still sorted after drag & drop, #2142

Browse Source
This commit is contained in:
zadam 2021-09-02 23:21:02 +02:00
parent 167d4816fd
commit 6e300c7cf5
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/better-sqlite3/linux-server-better_sqlite3.node
View File

Binary file not shown.

6
package-lock.json generated
View File

@ -2890,9 +2890,9 @@
}
},
"electron": {
"version": "14.0.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-14.0.0.tgz",
"integrity": "sha512-O6EI7L1BPIrTpEIFefjjmdbmSn9LtE4mmrv4dfpV4Mqaa8uKuNYQogwZPEvSwaBexb69eb1LQ25n+f+kBcjiRQ==",
"version": "13.3.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.3.0.tgz",
"integrity": "sha512-d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",

2
package.json
View File

@ -81,7 +81,7 @@
},
"devDependencies": {
"cross-env": "7.0.3",
"electron": "14.0.0",
"electron": "13.3.0",
"electron-builder": "22.11.7",
"electron-packager": "15.3.0",
"electron-rebuild": "3.2.3",

18
src/routes/api/branches.js
View File

@ -85,8 +85,6 @@ function moveBranchBeforeNote(req) {
}
}
entityChangesService.addNoteReorderingEntityChange(beforeBranch.parentNoteId);
if (branchToMove.parentNoteId === beforeBranch.parentNoteId) {
branchToMove.notePosition = originalBeforeNotePosition;
branchToMove.save();
@ -98,6 +96,13 @@ function moveBranchBeforeNote(req) {
branchToMove.markAsDeleted();
}
if (parentNote.hasLabel('sorted')) {
treeService.sortNotesByTitle(parentNote.noteId, false, false);
}
else {
entityChangesService.addNoteReorderingEntityChange(parentNote.noteId);
}
return { success: true };
}
@ -129,8 +134,6 @@ function moveBranchAfterNote(req) {
}
}
entityChangesService.addNoteReorderingEntityChange(afterNote.parentNoteId);
const movedNotePosition = originalAfterNotePosition + 10;
if (branchToMove.parentNoteId === afterNote.parentNoteId) {
@ -144,6 +147,13 @@ function moveBranchAfterNote(req) {
branchToMove.markAsDeleted();
}
if (parentNote.hasLabel('sorted')) {
treeService.sortNotesByTitle(parentNote.noteId, false, false);
}
else {
entityChangesService.addNoteReorderingEntityChange(parentNote.noteId);
}
return { success: true };
}