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

shortcut fixes

Browse Source
This commit is contained in:
zadam
2019-11-24 22:15:33 +01:00
parent 1e979d71c7
commit dbd2040bee
4 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/services/keyboard_actions.js
View File

@@ -162,19 +162,23 @@ const DEFAULT_KEYBOARD_ACTIONS = [
},
{
actionName: "OpenNewTab",
defaultShortcuts: isElectron ? ["CommandOrControl+T"] : []
defaultShortcuts: isElectron ? ["CommandOrControl+T"] : [],
description: "Opens new tab"
},
{
actionName: "CloseActiveTab",
defaultShortcuts: isElectron ? ["CommandOrControl+W"] : []
defaultShortcuts: isElectron ? ["CommandOrControl+W"] : [],
description: "Closes active tab"
},
{
actionName: "ActivateNextTab",
defaultShortcuts: isElectron ? ["CommandOrControl+Tab"] : []
defaultShortcuts: isElectron ? ["CommandOrControl+Tab"] : [],
description: "Activates tab on the right"
},
{
actionName: "ActivatePreviousTab",
defaultShortcuts: isElectron ? ["CommandOrControl+Shift+Tab"] : []
defaultShortcuts: isElectron ? ["CommandOrControl+Shift+Tab"] : [],
description: "Activates tab on the left"
},
@@ -183,39 +187,48 @@ const DEFAULT_KEYBOARD_ACTIONS = [
},
{
actionName: "ShowAttributes",
defaultShortcuts: ["Alt+A"]
defaultShortcuts: ["Alt+A"],
description: "Shows Attributes dialog"
},
{
actionName: "ShowNoteInfo",
defaultShortcuts: []
defaultShortcuts: [],
description: "Shows Note Info dialog"
},
{
actionName: "ShowNoteSource",
defaultShortcuts: []
defaultShortcuts: [],
description: "Shows Note Source dialog"
},
{
actionName: "ShowLinkMap",
defaultShortcuts: []
defaultShortcuts: [],
description: "Shows Link Map dialog"
},
{
actionName: "ShowOptions",
defaultShortcuts: []
defaultShortcuts: [],
description: "Shows Options dialog"
},
{
actionName: "ShowNoteRevisions",
defaultShortcuts: []
defaultShortcuts: [],
description: "Shows Note Revisions dialog"
},
{
actionName: "ShowRecentChanges",
defaultShortcuts: []
defaultShortcuts: [],
description: "Shows Recent Changes dialog"
},
{
actionName: "ShowSQLConsole",
defaultShortcuts: ["Alt+O"]
defaultShortcuts: ["Alt+O"],
description: "Shows SQL Console dialog"
},
{
actionName: "ShowHelp",
defaultShortcuts: ["F1"]
defaultShortcuts: ["F1"],
description: "Shows built-in Help / cheatsheet"
},
@@ -251,10 +264,6 @@ const DEFAULT_KEYBOARD_ACTIONS = [
defaultShortcuts: ["Alt+H"],
description: "Toggles note hoisting of active note"
},
{
actionName: "RunSQL",
defaultShortcuts: ["CommandOrControl+Enter"]
},
{
actionName: "ReloadFrontendApp",
defaultShortcuts: ["F5", "CommandOrControl+R"]

6
src/services/notes.js
View File

@@ -141,7 +141,7 @@ async function createNewNoteWithTarget(target, targetBranchId, params) {
return await createNewNote(params);
}
else if (target === 'after') {
const afterNote = await sql.getRow('SELECT notePosition FROM branches WHERE branchId = ?', [noteData.target_branchId]);
const afterNote = await sql.getRow('SELECT notePosition FROM branches WHERE branchId = ?', [targetBranchId]);
// not updating utcDateModified to avoig having to sync whole rows
await sql.execute('UPDATE branches SET notePosition = notePosition + 10 WHERE parentNoteId = ? AND notePosition > ? AND isDeleted = 0',
@@ -149,9 +149,11 @@ async function createNewNoteWithTarget(target, targetBranchId, params) {
params.notePosition = afterNote.notePosition + 10;
await createNewNote(params);
const retObject = await createNewNote(params);
await syncTableService.addNoteReorderingSync(params.parentNoteId);
return retObject;
}
else {
throw new Error(`Unknown target ${target}`);