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

hoisting bugfixes

Browse Source
This commit is contained in:
zadam 2020-10-19 22:10:25 +02:00
parent 991b335c3e
commit c2b64bad80
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,9 @@ class TabContext extends Component {
if (await hoistedNoteService.checkNoteAccess(resolvedNotePath) === false) { if (await hoistedNoteService.checkNoteAccess(resolvedNotePath) === false) {
return; // note is outside of hoisted subtree and user chose not to unhoist return; // note is outside of hoisted subtree and user chose not to unhoist
} }
// if user choise to unhoist, cache was reloaded, but might not contain this note (since it's on unexpanded path)
await treeCache.getNote(noteId);
} }
await this.triggerEvent('beforeNoteSwitch', {tabContext: this}); await this.triggerEvent('beforeNoteSwitch', {tabContext: this});
@ -78,10 +81,17 @@ class TabContext extends Component {
notePath: this.notePath notePath: this.notePath
}); });
} }
// close dangling autocompletes after closing the tab
$(".aa-input").autocomplete("close");
} }
/** @property {NoteShort} */ /** @property {NoteShort} */
get note() { get note() {
if (this.noteId && !(this.noteId in treeCache.notes)) {
logError(`Cannot find tabContext's note id='${this.noteId}'`);
}
return treeCache.notes[this.noteId]; return treeCache.notes[this.noteId];
} }

4
src/public/app/services/tree.js
View File

@ -62,7 +62,7 @@ async function resolveNotePathToSegments(notePath, logErrors = true) {
if (!parents.length) { if (!parents.length) {
if (logErrors) { if (logErrors) {
ws.logError(`No parents found for ${childNoteId} (${child.title})`); ws.logError(`No parents found for ${childNoteId} (${child.title}) for path ${notePath}`);
} }
return; return;
@ -83,8 +83,6 @@ async function resolveNotePathToSegments(notePath, logErrors = true) {
for (const noteId of pathToRoot) { for (const noteId of pathToRoot) {
effectivePath.push(noteId); effectivePath.push(noteId);
} }
effectivePath.push('root');
} }
break; break;

5
src/public/app/widgets/similar_notes.js
View File

@ -122,6 +122,11 @@ export default class SimilarNotesWidget extends TabAwareWidget {
const similarNotes = await server.get('similar-notes/' + this.noteId); const similarNotes = await server.get('similar-notes/' + this.noteId);
if (!similarNotes) {
this.toggleInt(false);
return;
}
this.toggleInt(similarNotes.length > 0); this.toggleInt(similarNotes.length > 0);
if (similarNotes.length === 0) { if (similarNotes.length === 0) {