Merge remote-tracking branch 'origin/stable'

This commit is contained in:
zadam
2021-01-29 21:19:48 +01:00
4 changed files with 6 additions and 4 deletions

View File

@@ -77,6 +77,11 @@ export default class ReadOnlyTextTypeWidget extends AbstractTextTypeWidget {
}
async doRefresh(note) {
// we load CKEditor also for read only notes because they contain content styles required for correct rendering of even read only notes
// we could load just ckeditor-content.css but that causes CSS conflicts when both build CSS and this content CSS is loaded at the same time
// (see https://github.com/zadam/trilium/issues/1590 for example of such conflict)
await libraryLoader.requireLibrary(libraryLoader.CKEDITOR);
const noteComplement = await treeCache.getNoteComplement(note.noteId);
this.$content.html(noteComplement.content);