Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	db/demo.zip
#	src/services/notes.js
#	src/services/request.js
This commit is contained in:
zadam
2020-08-10 23:45:17 +02:00
parent e663d7da1b 3b148eb6f8
commit 8d0df6ddb9
15 changed files with 210 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/utils.js
View File

@@ -155,7 +155,11 @@ function getContentDisposition(filename) {
return `file; filename="${sanitizedFilename}"; filename*=UTF-8''${sanitizedFilename}`;
}
const STRING_MIME_TYPES = ["application/x-javascript", "image/svg+xml"];
const STRING_MIME_TYPES = [
"application/javascript",
"application/x-javascript",
"image/svg+xml"
];
function isStringNote(type, mime) {
// render and book are string note in the sense that they are expected to contain empty string