Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-29 03:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

better activation behavior when move notes

Browse Source
This commit is contained in:
zadam 2020-03-29 22:54:14 +02:00
parent ca0e36ea81
commit 5024454914
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/public/javascripts/widgets/note_tree.js
View File

@ -460,6 +460,10 @@ export default class NoteTreeWidget extends TabAwareWidget {
}
async entitiesReloadedEvent({loadResults}) {
const activeNode = this.getActiveNode();
const activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
const activeNoteId = activeNode ? activeNode.data.noteId : null;
const noteIdsToUpdate = new Set();
const noteIdsToReload = new Set();
@ -515,9 +519,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
}
}
const activeNode = this.getActiveNode();
const activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
for (const noteId of loadResults.getNoteIds()) {
noteIdsToUpdate.add(noteId);
}
@ -554,11 +555,22 @@ export default class NoteTreeWidget extends TabAwareWidget {
}
if (activeNotePath) {
const node = await this.expandToNote(activeNotePath);
let node = await this.expandToNote(activeNotePath);
if (node.data.noteId !== activeNoteId) {
// if the active note has been moved elsewhere then it won't be found by the path
// so we switch to the alternative of trying to find it by noteId
const notesById = this.getNodesByNoteId(activeNoteId);
// if there are multiple clones then we'd rather not activate any one
node = notesById.length === 1 ? notesById[0] : null;
}
if (node) {
node.setActive(true, {noEvents: true});
}
}
}
async setExpandedToServer(branchId, isExpanded) {
utils.assertArguments(branchId);

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

@ -32,6 +32,7 @@ async function moveBranchToParent(req) {
const newNotePos = maxNotePos === null ? 0 : maxNotePos + 10;
const newBranch = branchToMove.createClone(parentNoteId, newNotePos);
newBranch.isExpanded = true;
await newBranch.save();
branchToMove.isDeleted = true;