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

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam
2020-05-06 00:00:01 +02:00
parent 6dfe335707 9b9d6d86d0
commit b452d7e5c5
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/public/app/services/main_tree_executors.js
View File

@@ -38,12 +38,6 @@ export default class MainTreeExecutors extends Component {
isProtected: activeNote.isProtected, isProtected: activeNote.isProtected,
saveSelection: false saveSelection: false
}); });
await ws.waitForMaxKnownSyncId();
appContext.tabManager.getActiveTabContext().setNote(note.noteId);
appContext.triggerCommand('focusAndSelectTitle');
} }
async createNoteAfterCommand() { async createNoteAfterCommand() {
@@ -55,17 +49,11 @@ export default class MainTreeExecutors extends Component {
return; return;
} }
const {note} = await noteCreateService.createNote(parentNoteId, { await noteCreateService.createNote(parentNoteId, {
target: 'after', target: 'after',
targetBranchId: node.data.branchId, targetBranchId: node.data.branchId,
isProtected: isProtected, isProtected: isProtected,
saveSelection: false saveSelection: false
}); });
await ws.waitForMaxKnownSyncId();
appContext.tabManager.getActiveTabContext().setNote(note.noteId);
appContext.triggerCommand('focusAndSelectTitle');
} }
} }

6
src/public/app/services/note_create.js
View File

@@ -48,8 +48,12 @@ async function createNote(parentNoteId, options = {}) {
} }
if (options.activate) { if (options.activate) {
await ws.waitForMaxKnownSyncId();
const activeTabContext = appContext.tabManager.getActiveTabContext(); const activeTabContext = appContext.tabManager.getActiveTabContext();
activeTabContext.setNote(note.noteId); await activeTabContext.setNote(note.noteId);
appContext.triggerCommand('focusAndSelectTitle');
} }
return {note, branch}; return {note, branch};

6
src/public/app/widgets/run_script_buttons.js
View File

@@ -23,4 +23,10 @@ export default class RunScriptButtonsWidget extends TabAwareWidget {
this.$renderButton.toggle(note.type === 'render'); this.$renderButton.toggle(note.type === 'render');
this.$executeScriptButton.toggle(note.mime.startsWith('application/javascript')); this.$executeScriptButton.toggle(note.mime.startsWith('application/javascript'));
} }
async entitiesReloadedEvent({loadResults}) {
if (loadResults.isNoteReloaded(this.noteId)) {
this.refresh();
}
}
} }