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

renamed currentNote to activeNote to be consistent with frontend API

Browse Source
This commit is contained in:
zadam
2019-03-14 20:21:27 +01:00
parent 0d0464549f
commit ef40c66344
22 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/public/javascripts/services/note_detail_code.js
View File

@@ -44,14 +44,14 @@ async function show() {
$component.show();
const currentNote = noteDetailService.getCurrentNote();
const activeNote = noteDetailService.getActiveNote();
// this needs to happen after the element is shown, otherwise the editor won't be refreshed
// CodeMirror breaks pretty badly on null so even though it shouldn't happen (guarded by consistency check)
// we provide fallback
codeEditor.setValue(currentNote.noteContent.content || "");
codeEditor.setValue(activeNote.noteContent.content || "");
const info = CodeMirror.findModeByMIME(currentNote.mime);
const info = CodeMirror.findModeByMIME(activeNote.mime);
if (info) {
codeEditor.setOption("mode", info.mime);
@@ -71,21 +71,21 @@ function focus() {
async function executeCurrentNote() {
// ctrl+enter is also used elsewhere so make sure we're running only when appropriate
if (noteDetailService.getCurrentNoteType() !== 'code') {
if (noteDetailService.getActiveNoteType() !== 'code') {
return;
}
// make sure note is saved so we load latest changes
await noteDetailService.saveNoteIfChanged();
const currentNote = noteDetailService.getCurrentNote();
const activeNote = noteDetailService.getActiveNote();
if (currentNote.mime.endsWith("env=frontend")) {
await bundleService.getAndExecuteBundle(noteDetailService.getCurrentNoteId());
if (activeNote.mime.endsWith("env=frontend")) {
await bundleService.getAndExecuteBundle(noteDetailService.getActiveNoteId());
}
if (currentNote.mime.endsWith("env=backend")) {
await server.post('script/run/' + noteDetailService.getCurrentNoteId());
if (activeNote.mime.endsWith("env=backend")) {
await server.post('script/run/' + noteDetailService.getActiveNoteId());
}
infoService.showMessage("Note executed");