Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

Allow attachments to be included in the scripts, closes #66

Browse Source
This commit is contained in:
azivner
2018-03-01 22:30:06 -05:00
parent ee0833390a
commit f4b57f4c57
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/entities/note.js
View File

@@ -24,7 +24,8 @@ class Note extends Entity {
}
isJavaScript() {
return this.type === "code" && this.mime === "application/javascript";
return (this.type === "code" || this.type === "file")
&& (this.mime === "application/javascript" || this.mime === "application/x-javascript");
}
async getAttributes() {

8
src/routes/api/script.js
View File

@@ -63,8 +63,10 @@ async function getSubTreeScripts(parentId, includedNoteIds, repository, isJavaSc
SELECT notes.*
FROM notes JOIN note_tree USING(noteId)
WHERE note_tree.isDeleted = 0 AND notes.isDeleted = 0
AND note_tree.parentNoteId = ? AND notes.type = 'code'
AND (notes.mime = 'application/javascript' OR notes.mime = 'text/html')`, [parentId]);
AND note_tree.parentNoteId = ? AND (notes.type = 'code' OR notes.type = 'file')
AND (notes.mime = 'application/javascript'
OR notes.mime = 'application/x-javascript'
OR notes.mime = 'text/html')`, [parentId]);
let script = "\r\n";
@@ -77,7 +79,7 @@ async function getSubTreeScripts(parentId, includedNoteIds, repository, isJavaSc
script += await getSubTreeScripts(child.noteId, includedNoteIds, repository);
if (!isJavaScript && child.mime === 'application/javascript') {
if (!isJavaScript && child.isJavaScript()) {
child.content = '<script>' + child.content + '</script>';
}