gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	src/public/app/widgets/note_tree.js
This commit is contained in:
zadam 2020-08-27 23:25:10 +02:00
commit 020a8766c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/services/note_content_renderer.js
View File

@ -92,7 +92,7 @@ async function getRenderedContent(note) {
function getRenderingType(note) { function getRenderingType(note) {
let type = note.type; let type = note.type;
if (type === 'file' && note.mime === 'application/pdf' && utils.isElectron()) { if (type === 'file' && note.mime === 'application/pdf') {
type = 'pdf'; type = 'pdf';
} }

2
src/public/app/widgets/type_widgets/file.js
View File

@ -138,7 +138,7 @@ export default class FileTypeWidget extends TypeWidget {
this.$previewContent.show().scrollTop(0); this.$previewContent.show().scrollTop(0);
this.$previewContent.text(noteComplement.content); this.$previewContent.text(noteComplement.content);
} }
else if (note.mime === 'application/pdf' && utils.isElectron()) { else if (note.mime === 'application/pdf') {
this.$pdfPreview.show(); this.$pdfPreview.show();
this.$pdfPreview.attr("src", utils.getUrlForDownload("api/notes/" + this.noteId + "/open")); this.$pdfPreview.attr("src", utils.getUrlForDownload("api/notes/" + this.noteId + "/open"));
} }