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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2019-08-15 08:52:34 +02:00
parent 963ed32ce4 5406b09f3a
commit 61520bc3b3
14 changed files with 126 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/public/javascripts/services/tree.js
View File

@@ -562,7 +562,7 @@ async function collapseTree(node = null) {
}
function focusTree() {
$tree.find('.fancytree-container').focus();
getTree().setFocus();
}
async function scrollToActiveNote() {
@@ -573,8 +573,8 @@ async function scrollToActiveNote() {
const node = await expandToNote(activeContext.notePath);
node.makeVisible({scrollIntoView: true});
node.setFocus(true);
await node.makeVisible({scrollIntoView: true});
node.setFocus();
}
}
@@ -769,7 +769,7 @@ messagingService.subscribeToOutsideSyncMessages(syncData => {
}
});
utils.bindShortcut('ctrl+o', async () => {
utils.bindGlobalShortcut('ctrl+o', async () => {
const node = getActiveNode();
const parentNoteId = node.data.parentNoteId;
const isProtected = await treeUtils.getParentProtectedStatus(node);
@@ -815,9 +815,9 @@ async function reloadNote(noteId) {
window.glob.createNoteInto = createNoteInto;
utils.bindShortcut('ctrl+p', createNoteInto);
utils.bindGlobalShortcut('ctrl+p', createNoteInto);
utils.bindShortcut('ctrl+.', scrollToActiveNote);
utils.bindGlobalShortcut('ctrl+.', scrollToActiveNote);
$(window).bind('hashchange', async function() {
if (isNotePathInAddress()) {
@@ -845,7 +845,7 @@ $tree.on('mousedown', '.fancytree-title', e => {
}
});
utils.bindShortcut('alt+c', () => collapseTree()); // don't use shortened form since collapseTree() accepts argument
utils.bindGlobalShortcut('alt+c', () => collapseTree()); // don't use shortened form since collapseTree() accepts argument
$collapseTreeButton.click(() => collapseTree());
$createTopLevelNoteButton.click(createNewTopLevelNote);