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 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam 2021-03-17 23:20:28 +01:00
commit 59e8cb8c8b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/app/widgets/note_tree.js
View File

@ -797,8 +797,10 @@ export default class NoteTreeWidget extends TabAwareWidget {
const node = await this.expandToNote(activeContext.notePath); const node = await this.expandToNote(activeContext.notePath);
await node.makeVisible({scrollIntoView: true}); if (node) {
node.setActive(true, {noEvents: true, noFocus: false}); await node.makeVisible({scrollIntoView: true});
node.setActive(true, {noEvents: true, noFocus: false});
}
} }
} }
@ -851,7 +853,11 @@ export default class NoteTreeWidget extends TabAwareWidget {
// these are real notes with real notePath, user can display them in a detail // these are real notes with real notePath, user can display them in a detail
// but they don't have a node in the tree // but they don't have a node in the tree
ws.logError(`Can't find node for child node of noteId=${childNoteId} for parent of noteId=${parentNode.data.noteId} and hoistedNoteId=${hoistedNoteService.getHoistedNoteId()}, requested path is ${notePath}`); const childNote = await treeCache.getNote(childNoteId);
if (!childNote || childNote.type !== 'image') {
ws.logError(`Can't find node for child node of noteId=${childNoteId} for parent of noteId=${parentNode.data.noteId} and hoistedNoteId=${hoistedNoteService.getHoistedNoteId()}, requested path is ${notePath}`);
}
} }
return; return;

1
src/public/app/widgets/type_widgets/read_only_code.js
View File

@ -5,6 +5,7 @@ const TPL = `
<style> <style>
.note-detail-read-only-code { .note-detail-read-only-code {
position: relative; position: relative;
min-height: 50px;
} }
.note-detail-read-only-code-content { .note-detail-read-only-code-content {

1
src/public/app/widgets/type_widgets/read_only_text.js
View File

@ -25,6 +25,7 @@ const TPL = `
padding-top: 10px; padding-top: 10px;
font-family: var(--detail-text-font-family); font-family: var(--detail-text-font-family);
position: relative; position: relative;
min-height: 50px;
} }
.note-detail-readonly-text p:first-child, .note-detail-readonly-text::before { .note-detail-readonly-text p:first-child, .note-detail-readonly-text::before {