diff --git a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml index ede612a71..5557cbb99 100644 --- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml +++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml @@ -10,647 +10,5 @@ - -
-
-
-
-
-
-
-
-
-
- 1 -
- - 1 -
- - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - 1 - - - 3 - TEXT|0s - 1 - - - 4 - INT|0s - 1 - 0 - - - 5 - TEXT|0s - 1 - "" - - - 1 - apiTokenId - 1 - - - apiTokenId - 1 - sqlite_autoindex_api_tokens_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - 1 - - - 3 - TEXT|0s - 1 - - - 4 - TEXT|0s - 1 - - - 5 - TEXT|0s - 1 - '' - - - 6 - INT|0s - 1 - 0 - - - 7 - TEXT|0s - 1 - - - 8 - TEXT|0s - 1 - - - 9 - INT|0s - 1 - - - 10 - TEXT|0s - NULL - - - 11 - TEXT|0s - 1 - "" - - - 12 - int|0s - 0 - - - 1 - attributeId - 1 - - - noteId - - - name -value - - - value - - - attributeId - 1 - sqlite_autoindex_attributes_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - 1 - - - 3 - TEXT|0s - 1 - - - 4 - INTEGER|0s - 1 - - - 5 - TEXT|0s - - - 6 - INTEGER|0s - 1 - 0 - - - 7 - INTEGER|0s - 1 - 0 - - - 8 - TEXT|0s - NULL - - - 9 - TEXT|0s - 1 - - - 10 - TEXT|0s - 1 - - - 11 - TEXT|0s - 1 - "" - - - 1 - branchId - 1 - - - noteId -parentNoteId - - - parentNoteId - - - branchId - 1 - sqlite_autoindex_branches_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - NULL - - - 3 - TEXT|0s - 1 - "" - - - 4 - TEXT|0s - 1 - - - 1 - noteId - 1 - - - noteId - 1 - sqlite_autoindex_note_contents_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - - - 3 - TEXT|0s - 1 - '' - - - 4 - TEXT|0s - 1 - - - 1 - noteRevisionId - 1 - - - noteRevisionId - 1 - sqlite_autoindex_note_revision_contents_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - 1 - - - 3 - TEXT|0s - - - 4 - INT|0s - 1 - - - 5 - INT|0s - 1 - 0 - - - 6 - INT|0s - 1 - 0 - - - 7 - TEXT|0s - 1 - - - 8 - TEXT|0s - 1 - - - 9 - TEXT|0s - 1 - - - 10 - TEXT|0s - 1 - - - 11 - TEXT|0s - 1 - - - 12 - TEXT|0s - 1 - '' - - - 13 - TEXT|0s - 1 - '' - - - 14 - TEXT|0s - 1 - '' - - - 1 - noteRevisionId - 1 - - - noteId - - - utcDateLastEdited - - - utcDateCreated - - - dateLastEdited - - - dateCreated - - - noteRevisionId - 1 - sqlite_autoindex_note_revisions_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - 1 - "note" - - - 3 - INT|0s - 1 - - - 4 - INT|0s - 1 - 0 - - - 5 - TEXT|0s - 1 - 'text' - - - 6 - TEXT|0s - 1 - 'text/html' - - - 7 - TEXT|0s - 1 - "" - - - 8 - INT|0s - 1 - 0 - - - 9 - TEXT|0s - NULL - - - 10 - INT|0s - 1 - 0 - - - 11 - TEXT|0s - 1 - - - 12 - TEXT|0s - 1 - - - 13 - TEXT|0s - 1 - - - 14 - TEXT|0s - 1 - - - 1 - noteId - 1 - - - title - - - type - - - isDeleted - - - dateCreated - - - dateModified - - - utcDateCreated - - - utcDateModified - - - noteId - 1 - sqlite_autoindex_notes_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - - - 3 - INTEGER|0s - 1 - 0 - - - 4 - TEXT|0s - 1 - "" - - - 5 - TEXT|0s - 1 - - - 6 - TEXT|0s - 1 - - - 1 - name - 1 - - - name - 1 - sqlite_autoindex_options_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - 1 - - - 3 - TEXT|0s - 1 - "" - - - 4 - TEXT|0s - 1 - - - 5 - INT|0s - - - 1 - noteId - 1 - - - noteId - 1 - sqlite_autoindex_recent_notes_1 - - - 1 - TEXT|0s - 1 - - - 2 - TEXT|0s - 1 - - - 1 - sourceId - 1 - - - utcDateCreated - - - sourceId - 1 - sqlite_autoindex_source_ids_1 - - - 1 - text|0s - - - 2 - text|0s - - - 3 - text|0s - - - 4 - int|0s - - - 5 - text|0s - - - 1 - - - 2 - - - 1 - INTEGER|0s - 1 - 1 - - - 2 - TEXT|0s - 1 - - - 3 - TEXT|0s - 1 - - - 4 - TEXT|0s - 1 - - - 5 - TEXT|0s - 1 - - - entityName -entityId - 1 - - - utcSyncDate - - - id - 1 - \ No newline at end of file diff --git a/src/public/javascripts/services/keyboard_actions.js b/src/public/javascripts/services/keyboard_actions.js index 9fdb663a4..a202a284e 100644 --- a/src/public/javascripts/services/keyboard_actions.js +++ b/src/public/javascripts/services/keyboard_actions.js @@ -94,8 +94,8 @@ async function getAction(actionName, silent = false) { } function updateDisplayedShortcuts($container) { - $container.find('kbd[data-kb-command]').each(async (i, el) => { - const actionName = $(el).attr('data-kb-command'); + $container.find('kbd[data-command]').each(async (i, el) => { + const actionName = $(el).attr('data-command'); const action = await getAction(actionName, true); if (action) { @@ -103,8 +103,8 @@ function updateDisplayedShortcuts($container) { } }); - $container.find('button[data-kb-command],a.icon-action[data-kb-command],.kb-in-title').each(async (i, el) => { - const actionName = $(el).attr('data-kb-command'); + $container.find('button[data-command],a.icon-action[data-command],.kb-in-title').each(async (i, el) => { + const actionName = $(el).attr('data-command'); const action = await getAction(actionName, true); if (action) { diff --git a/src/public/javascripts/services/tree_context_menu.js b/src/public/javascripts/services/tree_context_menu.js index 2bdb34ed5..ec7363da5 100644 --- a/src/public/javascripts/services/tree_context_menu.js +++ b/src/public/javascripts/services/tree_context_menu.js @@ -47,39 +47,39 @@ class TreeContextMenu { return [ { title: 'Open in new tab', cmd: "openInTab", uiIcon: "empty", enabled: noSelectedNotes }, - { title: 'Insert note after ', cmd: "insertNoteAfter", uiIcon: "plus", + { title: 'Insert note after ', cmd: "insertNoteAfter", uiIcon: "plus", items: insertNoteAfterEnabled ? this.getNoteTypeItems("insertNoteAfter") : null, enabled: insertNoteAfterEnabled && noSelectedNotes }, - { title: 'Insert child note ', cmd: "insertChildNote", uiIcon: "plus", + { title: 'Insert child note ', cmd: "insertChildNote", uiIcon: "plus", items: notSearch ? this.getNoteTypeItems("insertChildNote") : null, enabled: notSearch && noSelectedNotes }, - { title: 'Delete ', cmd: "deleteNotes", uiIcon: "trash", + { title: 'Delete ', cmd: "deleteNotes", uiIcon: "trash", enabled: isNotRoot && !isHoisted && parentNotSearch }, { title: "----" }, - { title: 'Search in subtree ', cmd: "searchInSubtree", uiIcon: "search", + { title: 'Search in subtree ', cmd: "searchInSubtree", uiIcon: "search", enabled: notSearch && noSelectedNotes }, - isHoisted ? null : { title: 'Hoist note ', cmd: "toggleNoteHoisting", uiIcon: "empty", enabled: noSelectedNotes && notSearch }, - !isHoisted || !isNotRoot ? null : { title: 'Unhoist note ', cmd: "toggleNoteHoisting", uiIcon: "arrow-up" }, - { title: 'Edit branch prefix ', cmd: "editBranchPrefix", uiIcon: "empty", + isHoisted ? null : { title: 'Hoist note ', cmd: "toggleNoteHoisting", uiIcon: "empty", enabled: noSelectedNotes && notSearch }, + !isHoisted || !isNotRoot ? null : { title: 'Unhoist note ', cmd: "toggleNoteHoisting", uiIcon: "arrow-up" }, + { title: 'Edit branch prefix ', cmd: "editBranchPrefix", uiIcon: "empty", enabled: isNotRoot && parentNotSearch && noSelectedNotes}, { title: "Advanced", uiIcon: "empty", enabled: true, items: [ - { title: 'Collapse subtree ', cmd: "collapseSubtree", uiIcon: "align-justify", enabled: noSelectedNotes }, + { title: 'Collapse subtree ', cmd: "collapseSubtree", uiIcon: "align-justify", enabled: noSelectedNotes }, { title: "Force note sync", cmd: "forceNoteSync", uiIcon: "refresh", enabled: noSelectedNotes }, - { title: 'Sort alphabetically ', cmd: "sortChildNotes", uiIcon: "empty", enabled: noSelectedNotes && notSearch } + { title: 'Sort alphabetically ', cmd: "sortChildNotes", uiIcon: "empty", enabled: noSelectedNotes && notSearch } ] }, { title: "----" }, { title: "Protect subtree", cmd: "protectSubtree", uiIcon: "check-shield", enabled: noSelectedNotes }, { title: "Unprotect subtree", cmd: "unprotectSubtree", uiIcon: "shield", enabled: noSelectedNotes }, { title: "----" }, - { title: 'Copy / clone ', cmd: "copyNotesToClipboard", uiIcon: "copy", + { title: 'Copy / clone ', cmd: "copyNotesToClipboard", uiIcon: "copy", enabled: isNotRoot && !isHoisted }, - { title: 'Clone to ... ', cmd: "cloneNotesTo", uiIcon: "empty", + { title: 'Clone to ... ', cmd: "cloneNotesTo", uiIcon: "empty", enabled: isNotRoot && !isHoisted }, - { title: 'Cut ', cmd: "cutNotesToClipboard", uiIcon: "cut", + { title: 'Cut ', cmd: "cutNotesToClipboard", uiIcon: "cut", enabled: isNotRoot && !isHoisted && parentNotSearch }, - { title: 'Move to ... ', cmd: "moveNotesTo", uiIcon: "empty", + { title: 'Move to ... ', cmd: "moveNotesTo", uiIcon: "empty", enabled: isNotRoot && !isHoisted && parentNotSearch }, - { title: 'Paste into ', cmd: "pasteNotesFromClipboard", uiIcon: "paste", + { title: 'Paste into ', cmd: "pasteNotesFromClipboard", uiIcon: "paste", enabled: !clipboard.isClipboardEmpty() && notSearch && noSelectedNotes }, { title: 'Paste after', cmd: "pasteNotesAfterFromClipboard", uiIcon: "paste", enabled: !clipboard.isClipboardEmpty() && isNotRoot && !isHoisted && parentNotSearch && noSelectedNotes }, diff --git a/src/public/javascripts/widgets/global_buttons.js b/src/public/javascripts/widgets/global_buttons.js index ff23e56de..520cd78b1 100644 --- a/src/public/javascripts/widgets/global_buttons.js +++ b/src/public/javascripts/widgets/global_buttons.js @@ -19,17 +19,17 @@ const WIDGET_TPL = ` `; diff --git a/src/public/javascripts/widgets/global_menu.js b/src/public/javascripts/widgets/global_menu.js index 56b53e14c..61fb82c6f 100644 --- a/src/public/javascripts/widgets/global_menu.js +++ b/src/public/javascripts/widgets/global_menu.js @@ -42,44 +42,44 @@ const TPL = ` Open Dev Tools - + Open SQL Console - + Show backend log - + Reload frontend - + Toggle Zen mode - + Toggle fullscreen - + Show Help - + diff --git a/src/public/javascripts/widgets/note_actions.js b/src/public/javascripts/widgets/note_actions.js index ab6efd81b..85208561c 100644 --- a/src/public/javascripts/widgets/note_actions.js +++ b/src/public/javascripts/widgets/note_actions.js @@ -14,13 +14,13 @@ const TPL = `
Revisions - Attributes - Link map - Note source + Attributes + Link map + Note source Import files Export note - Print note - Note info + Print note + Note info
`; diff --git a/src/public/javascripts/widgets/standard_top_widget.js b/src/public/javascripts/widgets/standard_top_widget.js index 2ecab8a4e..e205476e5 100644 --- a/src/public/javascripts/widgets/standard_top_widget.js +++ b/src/public/javascripts/widgets/standard_top_widget.js @@ -32,12 +32,12 @@ const TPL = `
- -
`; -const NEW_TAB_BUTTON_TPL = `
+
`; +const NEW_TAB_BUTTON_TPL = `
+
`; const FILLER_TPL = `
`; diff --git a/src/views/dialogs/help.ejs b/src/views/dialogs/help.ejs index 4ad750d81..3c67f2919 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
    • -
  • - jumps to parent note
    • -
  • - collapse whole note tree
    • -
  • - collapse sub-tree
    • +
  • , - go back / forwards in the history
    • +
  • - show "Jump to" dialog
    • +
  • - scroll to active note
    • +
  • - jumps to parent note
    • +
  • - collapse whole note tree
    • +
  • - collapse sub-tree

@@ -40,10 +40,10 @@ Only in desktop (electron build):
    -
  • opens empty tab
    • -
  • closes active tab
    • -
  • activates next tab
    • -
  • activates previous tab
    • +
  • opens empty tab
    • +
  • closes active tab
    • +
  • activates next tab
    • +
  • activates previous tab

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

    -
  • - creates new note after the active note
    • -
  • - creates new sub-note into active note
    • -
  • - edit prefix of active note clone
    • +
  • - creates new note after the active note
    • +
  • - creates new sub-note into active note
    • +
  • - 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
    • +
  • , - 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
  • Shift+click - select note
    • -
  • - copies active note (or current selection) into clipboard (used for cloning)
    • -
  • - cuts current (or current selection) note into clipboard (used for moving notes)
    • -
  • - 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)
    • -
  • - delete note / sub-tree
    • +
  • - copies active note (or current selection) into clipboard (used for cloning)
    • +
  • - cuts current (or current selection) note into clipboard (used for moving notes)
    • +
  • - 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)
    • +
  • - delete note / sub-tree

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

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

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

    -
  • - reloads Trilium frontend
    • -
  • - show developer tools
    • -
  • - show SQL console
    • +
  • - reloads Trilium frontend
    • +
  • - show developer tools
    • +
  • - show SQL console

@@ -135,10 +135,10 @@

    -
  • - Zen mode - display only note editor, everything else is hidden
    • -
  • - toggle search form in tree pane
    • -
  • - in page search
    • -
  • - show note attributes dialog
    • +
  • - Zen mode - display only note editor, everything else is hidden
    • +
  • - toggle search form in tree pane
    • +
  • - in page search
    • +
  • - show note attributes dialog