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

Merge branch 'master' into m41

Browse Source 
# Conflicts:
#	src/public/javascripts/services/entrypoints.js
This commit is contained in:
zadam
2020-01-19 09:30:38 +01:00
parent e355b449c4 ab535bf147
commit 37f279fab0
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/javascripts/services/entrypoints.js
View File

@@ -154,7 +154,7 @@ function registerEntrypoints() {
d.showDialog(selectedOrActiveNodes);
}));
keyboardActionService.setGlobalActionHandler("CreateNoteIntoDayNote", async () => {
const todayNote = await dateNoteService.getTodayNote();
@@ -203,6 +203,8 @@ function registerEntrypoints() {
});
keyboardActionService.setGlobalActionHandler('CollapseTree', () => appContext.getMainNoteTree().collapseTree());
keyboardActionService.setGlobalActionHandler("CopyWithoutFormatting", utils.copySelectionToClipboard);
}
export default {