Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-01 10:55:55 +01:00
Code Issues Packages Projects Releases Activity

fixes to recent changes

Browse Source
This commit is contained in:
azivner
2017-12-03 17:46:56 -05:00
parent 34f1eb930c
commit 3a26054619
3 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
public/javascripts/note_tree.js
View File

@@ -184,7 +184,32 @@ const noteTree = (function() {
}
async function activateNode(notePath) {
const runPath = getRunPath(notePath);
const noteId = treeUtils.getNoteIdFromNotePath(notePath);
let parentNoteId = 'root';
for (const childNoteId of runPath) {
const node = getNodesByNoteId(childNoteId).find(node => node.data.note_pid === parentNoteId);
if (childNoteId === noteId) {
await node.setActive();
}
else {
await node.setExpanded();
}
parentNoteId = childNoteId;
}
}
/**
* Accepts notePath and tries to resolve it. Part of the path might not be valid because of note moving (which causes
* path change) or other corruption, in that case this will try to get some other valid path to the correct note.
*/
function getRunPath(notePath) {
const path = notePath.split("/").reverse();
path.push('root');
const effectivePath = [];
let childNoteId = null;
@@ -224,27 +249,16 @@ const noteTree = (function() {
}
}
effectivePath.push(parentNoteId);
childNoteId = parentNoteId;
}
const noteId = treeUtils.getNoteIdFromNotePath(notePath);
const runPath = effectivePath.reverse();
let parentNoteId = 'root';
for (const childNoteId of runPath) {
const node = getNodesByNoteId(childNoteId).find(node => node.data.note_pid === parentNoteId);
if (childNoteId === noteId) {
await node.setActive();
if (parentNoteId === 'root') {
break;
}
else {
await node.setExpanded();
effectivePath.push(parentNoteId);
childNoteId = parentNoteId;
}
parentNoteId = childNoteId;
}
return effectivePath.reverse();
}
function showParentList(noteId, node) {