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

smaller refactorings in note_tree

Browse Source
This commit is contained in:
zadam
2020-08-24 23:33:27 +02:00
parent b7947a40ea
commit 6a3e27eb62
6 changed files with 85 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/public/app/services/tab_context.js
View File

@@ -26,25 +26,25 @@ class TabContext extends Component {
async setNote(inputNotePath, triggerSwitchEvent = true) {
const noteId = treeService.getNoteIdFromNotePath(inputNotePath);
let notePath;
let resolvedNotePath;
if ((await treeCache.getNote(noteId)).isDeleted) {
// no point in trying to resolve canonical notePath
notePath = inputNotePath;
resolvedNotePath = inputNotePath;
}
else {
notePath = await treeService.resolveNotePath(inputNotePath);
resolvedNotePath = await treeService.resolveNotePath(inputNotePath);
if (!notePath) {
if (!resolvedNotePath) {
console.error(`Cannot resolve note path ${inputNotePath}`);
return;
}
if (notePath === this.notePath) {
if (resolvedNotePath === this.notePath) {
return;
}
if (await hoistedNoteService.checkNoteAccess(notePath) === false) {
if (await hoistedNoteService.checkNoteAccess(resolvedNotePath) === false) {
return; // note is outside of hoisted subtree and user chose not to unhoist
}
}
@@ -53,7 +53,7 @@ class TabContext extends Component {
utils.closeActiveDialog();
this.notePath = notePath;
this.notePath = resolvedNotePath;
this.noteId = noteId;
this.autoBookDisabled = false;
@@ -62,7 +62,7 @@ class TabContext extends Component {
setTimeout(async () => {
// we include the note into recent list only if the user stayed on the note at least 5 seconds
if (notePath && notePath === this.notePath) {
if (resolvedNotePath && resolvedNotePath === this.notePath) {
await server.post('recent-notes', {
noteId: this.note.noteId,
notePath: this.notePath