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

execute note (ctrl+enter) now works for both frontend and backend scripts

Browse Source
This commit is contained in:
azivner 2018-03-05 23:19:46 -05:00
parent d26170762b
commit 6d0218cb36
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/javascripts/note_editor.js
View File

@ -298,9 +298,17 @@ const noteEditor = (function() {
// make sure note is saved so we load latest changes // make sure note is saved so we load latest changes
await saveNoteIfChanged(); await saveNoteIfChanged();
const bundle = await server.get('script/subtree/' + getCurrentNoteId()); if (currentNote.detail.mime.endsWith("env=frontend")) {
const bundle = await server.get('script/subtree/' + getCurrentNoteId());
executeBundle(bundle); executeBundle(bundle);
}
if (currentNote.detail.mime.endsWith("env=backend")) {
await server.post('script/run/' + getCurrentNoteId());
}
showMessage("Note executed");
} }
} }

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

@ -16,6 +16,17 @@ router.post('/exec', auth.checkApiAuth, wrap(async (req, res, next) => {
}); });
})); }));
router.post('/run/:noteId', auth.checkApiAuth, wrap(async (req, res, next) => {
const repository = new Repository(req);
const note = await repository.getNote(req.params.noteId);
const ret = await script.executeNote(note);
res.send({
executionResult: ret
});
}));
router.get('/startup', auth.checkApiAuth, wrap(async (req, res, next) => { router.get('/startup', auth.checkApiAuth, wrap(async (req, res, next) => {
const repository = new Repository(req); const repository = new Repository(req);
const notes = await attributes.getNotesWithAttribute(repository, "run", "frontend_startup"); const notes = await attributes.getNotesWithAttribute(repository, "run", "frontend_startup");