From 988fae50cbca0f43ceca602928f2a43f4fac0f83 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Sat, 18 Apr 2020 11:14:09 +0200
Subject: [PATCH] fix help links and displayed shortcuts, closes #971

---
 README.md                        |  2 +-
 src/public/app/services/utils.js |  5 ++++-
 src/views/dialogs/help.ejs       | 10 +++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d66c65042..8aad5e0a5 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Trilium Notes is a hierarchical note taking application with focus on building l
 ## Features
 
 * Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes))
-* Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-editor#autoformat)
+* Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
 * Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting
 * Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting)
 * Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions)
diff --git a/src/public/app/services/utils.js b/src/public/app/services/utils.js
index 115ca9915..ad490c982 100644
--- a/src/public/app/services/utils.js
+++ b/src/public/app/services/utils.js
@@ -239,7 +239,7 @@ function focusSavedElement() {
     $lastFocusedElement = null;
 }
 
-function openDialog($dialog) {
+async function openDialog($dialog) {
     closeActiveDialog();
 
     glob.activeDialog = $dialog;
@@ -253,6 +253,9 @@ function openDialog($dialog) {
             focusSavedElement();
         }
     });
+
+    const keyboardActionsService = (await import("./keyboard_actions.js")).default;
+    keyboardActionsService.updateDisplayedShortcuts($dialog);
 }
 
 function isHtmlEmpty(html) {
diff --git a/src/views/dialogs/help.ejs b/src/views/dialogs/help.ejs
index 3c67f2919..67cb3f7a3 100644
--- a/src/views/dialogs/help.ejs
+++ b/src/views/dialogs/help.ejs
@@ -18,7 +18,7 @@
                                 <ul>
                                     <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-command="backInNoteHistory"></kbd>, <kbd data-command="BackInNoteHistory"></kbd> - go back / forwards in the history</li>
+                                    <li><kbd data-command="backInNoteHistory"></kbd>, <kbd data-command="forwardInNoteHistory"></kbd> - go back / forwards in the history</li>
                                     <li><kbd data-command="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-command="scrollToActiveNote"></kbd> - scroll to active note</li>
                                     <li><kbd data-command="activateParentNote"></kbd> - jumps to parent note</li>
@@ -69,9 +69,9 @@
 
                             <p class="card-text">
                                 <ul>
-                                    <li><kbd data-command="moveNoteUp"></kbd>, <kbd data-command="MoveNoteDown"></kbd> - move note up/down in the note list</li>
-                                    <li><kbd data-command="moveNoteUpInHierarchy"></kbd>, <kbd data-command="MoveNoteDownInHierarchy"></kbd> - move note up in the hierarchy</li>
-                                    <li><kbd data-command="addNoteAboveToSelection"></kbd>, <kbd data-command="AddNoteBelowToSelection"></kbd> - multi-select note above/below</li>
+                                    <li><kbd data-command="moveNoteUp"></kbd>, <kbd data-command="moveNoteDown"></kbd> - move note up/down in the note list</li>
+                                    <li><kbd data-command="moveNoteUpInHierarchy"></kbd>, <kbd data-command="moveNoteDownInHierarchy"></kbd> - move note up in the hierarchy</li>
+                                    <li><kbd data-command="addNoteAboveToSelection"></kbd>, <kbd data-command="addNoteBelowToSelection"></kbd> - multi-select note above/below</li>
                                     <li><kbd data-command="selectAllNotesInParent"></kbd> - select all notes in the current level</li>
                                     <li><kbd>Shift+click</kbd> - select note</li>
                                     <li><kbd data-command="copyNotesToClipboard"></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>
@@ -102,7 +102,7 @@
 
                     <div class="card">
                         <div class="card-body">
-                            <h5 class="card-title"><a class="external" href="https://github.com/zadam/trilium/wiki/Text-editor#autoformat">Markdown-like autoformatting</a></h5>
+                            <h5 class="card-title"><a class="external" href="https://github.com/zadam/trilium/wiki/Text-notes#autoformat">Markdown-like autoformatting</a></h5>
 
                             <p class="card-text">
                                 <ul>