From 92cb723d0c537f4acedb9879565433cfbd5a66cb Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sat, 23 Nov 2019 22:17:08 +0100
Subject: [PATCH] updated inapp help with current shortcuts

---
 src/services/keyboard_actions.js | 20 ++++-----
 src/services/notes.js            |  1 +
 src/views/dialogs/help.ejs       | 72 ++++++++++++++++----------------
 3 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
index 2f39bd8f2..66c4d682a 100644
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -28,22 +28,22 @@ const DEFAULT_KEYBOARD_ACTIONS = [
         separator: "Tabs"
     },
     {
-        actionName: "NewTab",
+        actionName: "OpenNewTab",
         defaultShortcuts: ["CommandOrControl+T"],
         only: ELECTRON
     },
     {
-        actionName: "CloseTab",
+        actionName: "CloseActiveTab",
         defaultShortcuts: ["CommandOrControl+W"],
         only: ELECTRON
     },
     {
-        actionName: "NextTab",
+        actionName: "ActivateNextTab",
         defaultShortcuts: ["CommandOrControl+Tab"],
         only: ELECTRON
     },
     {
-        actionName: "PreviousTab",
+        actionName: "ActivatePreviousTab",
         defaultShortcuts: ["CommandOrControl+Shift+Tab"],
         only: ELECTRON
     },
@@ -120,22 +120,22 @@ const DEFAULT_KEYBOARD_ACTIONS = [
     },
     {
         actionName: "MoveNoteUp",
-        defaultShortcuts: ["Ctrl+Up"],
+        defaultShortcuts: ["CommandOrControl+Up"],
         description: "Move note up"
     },
     {
         actionName: "MoveNoteDown",
-        defaultShortcuts: ["Ctrl+Down"],
+        defaultShortcuts: ["CommandOrControl+Down"],
         description: "Move note down"
     },
     {
         actionName: "MoveNoteUpInHierarchy",
-        defaultShortcuts: ["Ctrl+Left"],
+        defaultShortcuts: ["CommandOrControl+Left"],
         description: "Move note up in hierarchy"
     },
     {
         actionName: "MoveNoteDownInHierarchy",
-        defaultShortcuts: ["Ctrl+Right"],
+        defaultShortcuts: ["CommandOrControl+Right"],
         description: "Move note down in hierarchy"
     },
     {
@@ -175,7 +175,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
     },
     {
         actionName: "SortChildNotes",
-        defaultShortcuts: ["Alt+s"],
+        defaultShortcuts: ["Alt+S"],
         description: "Sort child notes"
     },
     {
@@ -232,7 +232,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
         defaultShortcuts: ["CommandOrControl+return"]
     },
     {
-        actionName: "InsertDateTime",
+        actionName: "InsertDateTimeToText",
         defaultShortcuts: ["Alt+T"]
     },
     {
diff --git a/src/services/notes.js b/src/services/notes.js
index 85e51bdea..7f8fe74ee 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -264,6 +264,7 @@ async function saveLinks(note, content) {
     if (note.type === 'text') {
         content = findImageLinks(content, foundLinks);
         content = findInternalLinks(content, foundLinks);
+        content = findExternalLinks(content, foundLinks);
     }
     else if (note.type === 'relation-map') {
         findRelationMapLinks(content, foundLinks);
diff --git a/src/views/dialogs/help.ejs b/src/views/dialogs/help.ejs
index d734a8a54..02ddd80a2 100644
--- a/src/views/dialogs/help.ejs
+++ b/src/views/dialogs/help.ejs
@@ -16,14 +16,14 @@
 
                             <p class="card-text">
                                 <ul>
-                                    <li><kbd>UP/DOWN</kbd> - go up/down in the list of notes</li>
-                                    <li><kbd>LEFT/RIGHT</kbd> - collapse/expand node</li>
-                                    <li><kbd>ALT+LEFT/RIGHT</kbd> - go back / forwards in the history</li>
-                                    <li><kbd>CTRL+J</kbd> - show <a class="external" href="https://github.com/zadam/trilium/wiki/Note-navigation#jump-to-note">"Jump to" dialog</a></li>
-                                    <li><kbd>CTRL+.</kbd> - scroll to active note</li>
-                                    <li><kbd>BACKSPACE</kbd> - jumps to parent note</li>
-                                    <li><kbd>ALT+C</kbd> - collapse whole note tree</li>
-                                    <li><kbd>ALT+-</kbd> (alt with minus sign) - collapse sub-tree</li>
+                                    <li><kbd>UP</kbd>, <kbd>DOWN</kbd> - go up/down in the list of notes</li>
+                                    <li><kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - collapse/expand node</li>
+                                    <li><kbd data-kb-action="BackInNoteHistory"></kbd>, <kbd data-kb-action="BackInNoteHistory">ALT+RIGHT</kbd> - go back / forwards in the history</li>
+                                    <li><kbd data-kb-action="JumpToNote"></kbd> - show <a class="external" href="https://github.com/zadam/trilium/wiki/Note-navigation#jump-to-note">"Jump to" dialog</a></li>
+                                    <li><kbd data-kb-action="ScrollToActiveNote"></kbd> - scroll to active note</li>
+                                    <li><kbd data-kb-action="ActivateParentNote"></kbd> - jumps to parent note</li>
+                                    <li><kbd data-kb-action="CollapseTree"></kbd> - collapse whole note tree</li>
+                                    <li><kbd data-kb-action="CollapseSubtree"></kbd> - collapse sub-tree</li>
                                 </ul>
                             </p>
                         </div>
@@ -40,10 +40,10 @@
 
                             Only in desktop (electron build):
                             <ul>
-                                <li><kbd>CTRL+T</kbd> opens empty tab</li>
-                                <li><kbd>CTRL+W</kbd> closes active tab</li>
-                                <li><kbd>CTRL+Tab</kbd> activates next tab</li>
-                                <li><kbd>CTRL+Shift+Tab</kbd> activates previous tab</li>
+                                <li><kbd data-kb-action="OpenNewTab"></kbd> opens empty tab</li>
+                                <li><kbd data-kb-action="CloseActiveTab"></kbd> closes active tab</li>
+                                <li><kbd data-kb-action="ActivateNextTab">CTRL+Tab</kbd> activates next tab</li>
+                                <li><kbd data-kb-action="ActivatePreviousTab">CTRL+Shift+Tab</kbd> activates previous tab</li>
                             </ul>
                             </p>
                         </div>
@@ -55,9 +55,9 @@
 
                             <p class="card-text">
                                 <ul>
-                                    <li><kbd>CTRL+O</kbd> - creates new note after the active note</li>
-                                    <li><kbd>CTRL+P</kbd> - creates new sub-note into active note</li>
-                                    <li><kbd>F2</kbd> - edit <a class="external" href="https://github.com/zadam/trilium/wiki/Tree concepts#prefix">prefix</a> of active note clone</li>
+                                    <li><kbd data-kb-action="CreateNoteAfter"></kbd> - creates new note after the active note</li>
+                                    <li><kbd data-kb-action="CreateNoteInto"></kbd> - creates new sub-note into active note</li>
+                                    <li><kbd data-kb-action="EditBranchPrefix"></kbd> - edit <a class="external" href="https://github.com/zadam/trilium/wiki/Tree concepts#prefix">prefix</a> of active note clone</li>
                                 </ul>
                             </p>
                         </div>
@@ -69,15 +69,15 @@
 
                             <p class="card-text">
                                 <ul>
-                                    <li><kbd>CTRL+UP/DOWN</kbd> - move note up/down in the note list</li>
-                                    <li><kbd>CTRL+LEFT/RIGHT</kbd> - move note up in the hierarchy</li>
-                                    <li><kbd>SHIFT+UP/DOWN</kbd> - multi-select note above/below</li>
-                                    <li><kbd>CTRL+A</kbd> - select all notes in the current level</li>
-                                    <li><kbd>CTRL+click</kbd> - select note</li>
-                                <li><kbd>CTRL+C</kbd> - copies active note (or current selection) into clipboard (used for <a class="external" href="https://github.com/zadam/trilium/wiki/Cloning notes">cloning</a>)</li>
-                                    <li><kbd>CTRL+X</kbd> - cuts current (or current selection) note into clipboard (used for moving notes)</li>
-                                    <li><kbd>CTRL+V</kbd> - pastes note(s) as sub-note into active note (which is either move or clone depending on whether it was copied or cut into clipboard)</li>
-                                    <li><kbd>DEL</kbd> - delete note / sub-tree</li>
+                                    <li><kbd data-kb-action="MoveNoteUp"></kbd>, <kbd data-kb-action="MoveNoteDown"></kbd> - move note up/down in the note list</li>
+                                    <li><kbd data-kb-action="MoveNoteUpInHierarchy"></kbd>, <kbd data-kb-action="MoveNoteDownInHierarchy"></kbd> - move note up in the hierarchy</li>
+                                    <li><kbd data-kb-action="AddNoteAboveToSelection"></kbd>, <kbd data-kb-action="AddNoteBelowToSelection"></kbd> - multi-select note above/below</li>
+                                    <li><kbd data-kb-action="SelectAllNotesInParent">CTRL+A</kbd> - select all notes in the current level</li>
+                                    <li><kbd>Shift+click</kbd> - select note</li>
+                                    <li><kbd data-kb-action="CopyNotesToClipboard">CTRL+C</kbd> - copies active note (or current selection) into clipboard (used for <a class="external" href="https://github.com/zadam/trilium/wiki/Cloning notes">cloning</a>)</li>
+                                    <li><kbd data-kb-action="CutNotesToClipboard">CTRL+X</kbd> - cuts current (or current selection) note into clipboard (used for moving notes)</li>
+                                    <li><kbd data-kb-action="PasteNotesFromClipboard">CTRL+V</kbd> - pastes note(s) as sub-note into active note (which is either move or clone depending on whether it was copied or cut into clipboard)</li>
+                                    <li><kbd data-kb-action="DeleteNotes">DEL</kbd> - delete note / sub-tree</li>
                                 </ul>
                             </p>
                         </div>
@@ -89,11 +89,11 @@
 
                             <p class="card-text">
                                 <ul>
-                                    <li><kbd>ENTER</kbd> in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. <kbd>CTRL+.</kbd> switches back from editor to tree pane.</li>
-                                    <li><kbd>CTRL+K</kbd> - create / edit external link</li>
-                                    <li><kbd>CTRL+L</kbd> - create internal link</li>
-                                    <li><kbd>ALT+T</kbd> - inserts current date and time at caret position</li>
-                                    <li><kbd>CTRL+.</kbd> - jump away to the tree pane and scroll to active note</li>
+                                    <li><kbd data-kb-action="EditNoteTitle"></kbd> in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. <kbd>CTRL+.</kbd> switches back from editor to tree pane.</li>
+                                    <li><kbd>Ctrl+K</kbd> - create / edit external link</li>
+                                    <li><kbd data-kb-action="AddLinkToText"></kbd> - create internal link</li>
+                                    <li><kbd data-kb-action="InsertDateTimeToText"></kbd> - inserts current date and time at caret position</li>
+                                    <li><kbd data-kb-action="ScrollToActiveNote"></kbd> - jump away to the tree pane and scroll to active note</li>
                                 </ul>
                             </p>
                         </div>
@@ -120,9 +120,9 @@
 
                             <p class="card-text">
                                 <ul>
-                                    <li><kbd>F5</kbd> or <kbd>CTRL-R</kbd> - reloads Trilium frontend</li>
-                                    <li><kbd>CTRL+SHIFT+I</kbd> - show developer tools</li>
-                                    <li><kbd>ALT+O</kbd> - show SQL console</li>
+                                    <li><kbd data-kb-action="ReloadFrontendApp"></kbd> - reloads Trilium frontend</li>
+                                    <li><kbd data-kb-action="OpenDevTools"></kbd> - show developer tools</li>
+                                    <li><kbd data-kb-action="ShowSQLConsole">ALT+O</kbd> - show SQL console</li>
                                 </ul>
                             </p>
                         </div>
@@ -134,10 +134,10 @@
 
                             <p class="card-text">
                                 <ul>
-                                    <li><kbd>ALT+M</kbd> - Zen mode - display only note editor, everything else is hidden</li>
-                                    <li><kbd>CTRL+S</kbd> - toggle search form in tree pane</li>
-                                    <li><kbd>CTRL+F</kbd> - in page search</li>
-                                    <li><kbd>ALT+A</kbd> - show note attributes dialog</li>
+                                    <li><kbd data-kb-action="ToggleZenMode"></kbd> - Zen mode - display only note editor, everything else is hidden</li>
+                                    <li><kbd data-kb-action="SearchNotes"></kbd> - toggle search form in tree pane</li>
+                                    <li><kbd data-kb-action="FindInText">CTRL+F</kbd> - in page search</li>
+                                    <li><kbd data-kb-action="ShowAttributes">ALT+A</kbd> - show note attributes dialog</li>
                                 </ul>
                             </p>
                         </div>