From 8e1b8ab26c3a998f4a94a45ac6489dd017686162 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 15 Apr 2021 21:45:37 +0200 Subject: [PATCH] show not set keyboard shortcuts as "not set", #1851 --- src/public/app/services/keyboard_actions.js | 6 +- src/scripts/Reddit Importer.tar | Bin 9216 -> 0 bytes src/views/dialogs/help.ejs | 62 ++++++++++---------- 3 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 src/scripts/Reddit Importer.tar diff --git a/src/public/app/services/keyboard_actions.js b/src/public/app/services/keyboard_actions.js index 53ea4dcaf..0e2a47d3a 100644 --- a/src/public/app/services/keyboard_actions.js +++ b/src/public/app/services/keyboard_actions.js @@ -89,7 +89,11 @@ function updateDisplayedShortcuts($container) { const action = await getAction(actionName, true); if (action) { - $(el).text(action.effectiveShortcuts.join(', ')); + const keyboardActions = action.effectiveShortcuts.join(', '); + + if (keyboardActions || $(el).text() !== "not set") { + $(el).text(keyboardActions); + } } }); diff --git a/src/scripts/Reddit Importer.tar b/src/scripts/Reddit Importer.tar deleted file mode 100644 index 53de98409bc0f160d8bc1f51d19949f11ada394c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9216 zcmeHM>u=jO5Z~AMuece-;(=nF{d3`2^c#)=I{GYr@;G_*v=N@PkCsW?XJ|9!tB z^-h{BL-zP!0f}Yucu(@~$Mdlag3!=(nZ&7)skf9yeD%oBa5#MZ@+EzRPdx3<;b{13 zOrsYsUXEXlM&sdY8jfCI0q7oCk6YPg+K3dY-8%Vz!M1S^So&X*UUzo7mon91th)O& z>f@^)#Y*DKTtr&(fQpTr1{mok=ZmYw_@|HANtktc%7i9j+U{|4AKA$ymGkflvnq=s zOTA7ku^$K0QY^!z9S}(pg}yM*VsI`lh4#}hF$YpzPG-WtkSeg`!k9FiWkzZ+{jIaJ z1MPR9M9wx6GZ`@<#*}cJ(@f(s-;sbCj3xMSX3}1V zp3=Km?HZcL>6tWSV$!S7_zUVv#W^_W@|a08>Cs805<$78NH3rSrjgw#R#Yn=#N`}m zot|UDm$Z(vT^N;05v=ky~VY^ow9i>QhmCrdd49r6i4E;8GLbmoce2*|WX-rL*Tqif4Bl_pEoL1)wHh?Rin5CMlB3pv8~<4hU7cW`sFZAboh9%$wN zK^f0Syb0Ws|A)x-t^EILi~s+no$@gJ|5JMP$FE1Ar|21VKXvgx3=S-i0DxeUrZfWZ zcn47RBcSH@aq9MF4;xXQpi%JAq;>AVH9&DZi3uoPBlC1N(hsX8v)aB*YR|7+sb z3%Wmf=Y_cIg0D?G!PNF%_6ye$S|}A0_x2@LBE{|Fl5Yc>#+u*DZ<|^q%E8>>Y@&1X z?fcDP>!Tc4_j2sY5V=ocj(+GgfE&4eRgY+d`wBWam^ob-lj!}yV6|F#&T0=ZeUNFH z4xU`s_-(v%9jnt?ta#VtGV09P9nAdMgu36_`3aw!obrx6lS-Z7NHq71xC&#vr3E^9jO5r+0d656wRPtS(f%!X0gP zE`8%N!ISGc!_8?;E4ID3VemUYH_nE=ji$JkPN-nSN_)k4O?wVhaeXR+jAg?b3E#)~ z>Vj0_uDS8ty+A_SJdT(ps=309Zg_#U21j@{lLs^ykQwo~X~oxQzWO@Va7$j} z&W$ig^jpgv>}==%#nYI|Rn9Nn6Q^@Kdc3kh$mbpoxIf=b17te4p^@Axqx*#!9#VZP zat-~gubg%)wC&1VGv}km!dkp5^%3Br1hD$pW|;{i?S(q#l$ckCo{}r#?+B>9Dtj*N z1)nnGqHN>3z zt{H%$=q$RMFDI^oNx7uKx*DxY zcVxUW%9)bd7m0jtmQfknSsbiCEim$hfC?O7)7bC#f{QA-vIhJ#)T&O6shaE}>NyP4 z+oQ>0t9mjEx4-T#$w{efS(J+i@J9P&e`V?04jk{Tc9CW={M=ov9SzZ!Dy`caKLD&% z1-m-p$rjPm!T9JyWgv+*lwg%9glpot<13o0~Gj4-NbM4u;$`qn+p z>ziwRp^uo0;+`aD0OFF(FL^v$nX(R9m~TT+yI?(gR_)7LaztH0jy3qr3jITIDQPBA z6IEOmyh10m8I^15Cg>{m^CcQTMnwTvp&5FZYR#HE$)z%oU{^}CN|DfbHQJusR7G+E z&cLRnI0|H1uHdBKsL2+!aJR8-6dlsAT@!B500Ox)=Vp#>g=shC)tp`PSB?nVLK^7s z9=uS)3OTYPpar+5+czW*Yg-m$y1NX@70;C}Hd_g%rbQ$8$#t9arVO^ncxwAw-5odH N?bOx-TMrZ-_!IWt9o_%{ diff --git a/src/views/dialogs/help.ejs b/src/views/dialogs/help.ejs index 2c28a26d8..7cce6df02 100644 --- a/src/views/dialogs/help.ejs +++ b/src/views/dialogs/help.ejs @@ -18,12 +18,12 @@
  • UP, DOWN - go up/down in the list of notes
  • LEFT, RIGHT - collapse/expand node
    • -
  • , - go back / forwards in the history
    • -
  • - show "Jump to" dialog
    • -
  • - scroll to active note
    • +
  • not set, not set - go back / forwards in the history
    • +
  • not set - show "Jump to" dialog
    • +
  • not set - scroll to active note
  • Backspace - jump to parent note
    • -
  • - collapse whole note tree
    • -
  • - collapse sub-tree
    • +
  • not set - collapse whole note tree
    • +
  • not set - collapse sub-tree

@@ -40,10 +40,10 @@ Only in desktop (electron build):
    -
  • open empty tab
    • -
  • close active tab
    • -
  • activate next tab
    • -
  • activate previous tab
    • +
  • not set open empty tab
    • +
  • not set close active tab
    • +
  • not set activate next tab
    • +
  • not set activate previous tab

@@ -55,9 +55,9 @@

    -
  • - create new note after the active note
    • -
  • - create new sub-note into active note
    • -
  • - edit prefix of active note clone
    • +
  • not set - create new note after the active note
    • +
  • not set - create new sub-note into active note
    • +
  • not set - edit prefix of active note clone

@@ -69,15 +69,15 @@

    -
  • , - move note up/down in the note list
    • -
  • , - move note up in the hierarchy
    • -
  • , - multi-select note above/below
    • -
  • - select all notes in the current level
    • +
  • not set, not set - move note up/down in the note list
    • +
  • not set, not set - move note up in the hierarchy
    • +
  • not set, not set - multi-select note above/below
    • +
  • not set - select all notes in the current level
  • Shift+click - select note
    • -
  • - copy active note (or current selection) into clipboard (used for cloning)
    • -
  • - cut current (or current selection) note into clipboard (used for moving notes)
    • -
  • - paste note(s) as sub-note into active note (which is either move or clone depending on whether it was copied or cut into clipboard)
    • -
  • - delete note / sub-tree
    • +
  • not set - copy active note (or current selection) into clipboard (used for cloning)
    • +
  • not set - cut current (or current selection) note into clipboard (used for moving notes)
    • +
  • not set - paste note(s) as sub-note into active note (which is either move or clone depending on whether it was copied or cut into clipboard)
    • +
  • not set - delete note / sub-tree

@@ -89,12 +89,12 @@

    -
  • in tree pane will switch from tree pane into note title. Enter from note title will switch focus to text editor. - will switch back from editor to tree pane.
    • +
  • not set in tree pane will switch from tree pane into note title. Enter from note title will switch focus to text editor. + not set will switch back from editor to tree pane.
  • Ctrl+K - create / edit external link
    • -
  • - create internal link
    • -
  • - insert current date and time at caret position
    • -
  • - jump away to the tree pane and scroll to active note
    • +
  • not set - create internal link
    • +
  • not set - insert current date and time at caret position
    • +
  • not set - jump away to the tree pane and scroll to active note

@@ -121,9 +121,9 @@

    -
  • - reload Trilium frontend
    • -
  • - show developer tools
    • -
  • - show SQL console
    • +
  • not set - reload Trilium frontend
    • +
  • not set - show developer tools
    • +
  • not set - show SQL console

@@ -135,9 +135,9 @@

    -
  • - Zen mode - display only note editor, everything else is hidden
    • -
  • - toggle search form in tree pane
    • -
  • - in page search
    • +
  • not set - Zen mode - display only note editor, everything else is hidden
    • +
  • not set - focus on quick search input
    • +
  • not set - in page search