From ab3ba3e2ca2e7fb9e17831afbdde1390c7be91be Mon Sep 17 00:00:00 2001 From: j-krl <63491353+j-krl@users.noreply.github.com> Date: Sun, 24 May 2020 03:11:45 -0600 Subject: [PATCH] formatting --- CliClient/app/app-gui.js | 2 ++ CliClient/app/app.js | 1 - docs/terminal/index.html | 6 +++--- joplin.code-workspace | 3 --- readme/terminal.md | 6 +++--- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CliClient/app/app-gui.js b/CliClient/app/app-gui.js index 9a0635ce6f..8e6f20e1c0 100644 --- a/CliClient/app/app-gui.js +++ b/CliClient/app/app-gui.js @@ -779,6 +779,7 @@ class AppGui { // ------------------------------------------------------------------------- // Process shortcut and execute associated command // ------------------------------------------------------------------------- + const shortcutKey = this.currentShortcutKeys_.join(''); const keymapItem = this.keymapItemByKey(shortcutKey); @@ -792,6 +793,7 @@ class AppGui { this.logger().debug('Shortcut:', shortcutKey, keymapItem); this.currentShortcutKeys_ = []; + if (keymapItem.type === 'function') { this.processFunctionCommand(keymapItem.command); } else if (keymapItem.type === 'prompt') { diff --git a/CliClient/app/app.js b/CliClient/app/app.js index 17b9d13ae8..56fe0cd9d5 100644 --- a/CliClient/app/app.js +++ b/CliClient/app/app.js @@ -314,7 +314,6 @@ class Application extends BaseApplication { } async loadKeymaps() { - // NOTE: This is where the shortcuts are mapped. types are stored in app-gui.js. Mine are now already input. const defaultKeyMap = [ { keys: [':'], type: 'function', command: 'enter_command_line_mode' }, { keys: ['TAB'], type: 'function', command: 'focus_next' }, diff --git a/docs/terminal/index.html b/docs/terminal/index.html index d93fb359de..170f929c2e 100644 --- a/docs/terminal/index.html +++ b/docs/terminal/index.html @@ -506,9 +506,9 @@ PAGE_DOWN page_down ENTER activate DELETE, BACKSPACE delete (SPACE) todo toggle $n -n next_link -b previous_link -o open_link +n next_link +b previous_link +o open_link tc toggle_console tm toggle_metadata / search "" diff --git a/joplin.code-workspace b/joplin.code-workspace index 8b253f84ac..b48a975751 100644 --- a/joplin.code-workspace +++ b/joplin.code-workspace @@ -8,9 +8,6 @@ "name": "Joplin Nextcloud App", "path": "D:/Web/www/nextcloud/apps/joplin" }, - { - "path": "../tkwidgets" - } ], "settings": { "files.exclude": { diff --git a/readme/terminal.md b/readme/terminal.md index 1ccc31a45d..0361f58f61 100644 --- a/readme/terminal.md +++ b/readme/terminal.md @@ -176,9 +176,9 @@ There are two types of shortcuts: those that manipulate the user interface direc ENTER activate DELETE, BACKSPACE delete (SPACE) todo toggle $n - n next_link - b previous_link - o open_link + n next_link + b previous_link + o open_link tc toggle_console tm toggle_metadata / search ""