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

Merge branch 'master' into next58

Browse Source 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
This commit is contained in:
zadam
2022-11-22 20:46:08 +01:00
parent c92b451033 a76bef1a28
commit 19126b7c6d
141 changed files with 17696 additions and 14852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/app/widgets/note_tree.js
View File

@@ -347,7 +347,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
node.setFocus(true);
}
else if (event.ctrlKey) {
else if ((!utils.isMac() && event.ctrlKey) || (utils.isMac() && event.metaKey)) {
const notePath = treeService.getNotePath(node);
appContext.tabManager.openTabWithNoteWithHoisting(notePath);
}
@@ -1483,7 +1483,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
clipboard.pasteInto(node.data.branchId);
}
pasteNotesAfterFromClipboard({node}) {
pasteNotesAfterFromClipboardCommand({node}) {
clipboard.pasteAfter(node.data.branchId);
}