From 4d6eda8fe6b4f71c6b37f63297283ead344c5dcb Mon Sep 17 00:00:00 2001 From: azivner Date: Fri, 27 Jul 2018 09:22:25 +0200 Subject: [PATCH] #129, added input icon to trigger recent notes for easy discovery and mouse control --- src/public/images/icons/clock-16.png | Bin 0 -> 381 bytes src/public/javascripts/dialogs/add_link.js | 13 +++++++++++- .../javascripts/dialogs/jump_to_note.js | 10 +++++++-- src/public/javascripts/dialogs/labels.js | 1 - src/views/index.ejs | 19 +++++++++++++----- 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 src/public/images/icons/clock-16.png diff --git a/src/public/images/icons/clock-16.png b/src/public/images/icons/clock-16.png new file mode 100644 index 0000000000000000000000000000000000000000..bd48c1347239b97cd9904256aa791cfa33560a1b GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHiRBlz^c0eK#XN1_nkhPZ!4!i_^WAZT*}AMOYs2Z!y@& zP%XXDLHeRoGj}2PKV7Ho56+8i*|^cXB~?P%$!A4OV^E^8%6at{v!6WKduFa>`K02! zvq?D%r~Vg=3prqPE_ueZtd7eW&ysj+YaVj_j_{RzV3oc%qyFxl;}X`a|1?aU)n~<7 zp0u>{POI<`-8frC-L+`S4K0%f={=6Jw{INS`)bEwwOe0jJgjW2knI&Rzr5|0q~Mij zGvp_KkewdE8GpXqDtbodF*APNm;oLOOQ~j9}ZrJCo`zyG8ZtBFg^`Bkt YXP&g%oV3Rx1Q<{Zp00i_>zopr0G=
    h($ literal 0 HcmV?d00001 diff --git a/src/public/javascripts/dialogs/add_link.js b/src/public/javascripts/dialogs/add_link.js index 72ac73ac8..cbe619f5d 100644 --- a/src/public/javascripts/dialogs/add_link.js +++ b/src/public/javascripts/dialogs/add_link.js @@ -15,6 +15,7 @@ const $prefixFormGroup = $("#add-link-prefix-form-group"); const $linkTypeDiv = $("#add-link-type-div"); const $linkTypes = $("input[name='add-link-type']"); const $linkTypeHtml = $linkTypes.filter('input[value="html"]'); +const $showRecentNotesButton = $("#add-link-show-recent-notes"); function setLinkType(linkType) { $linkTypes.each(function () { @@ -74,6 +75,10 @@ async function showDialog() { }, minLength: 0, change: async (event, ui) => { + if (!ui.item) { + return; + } + const notePath = linkService.getNodePathFromLabel(ui.item.value); if (!notePath) { @@ -103,7 +108,7 @@ async function showDialog() { } }); - $autoComplete.autocomplete("search", ""); + showRecentNotes(); } $form.submit(() => { @@ -167,8 +172,14 @@ function linkTypeChanged() { $linkTypeDiv.toggle(!hasSelection()); } +function showRecentNotes() { + $autoComplete.autocomplete("search", ""); +} + $linkTypes.change(linkTypeChanged); +$showRecentNotesButton.click(showRecentNotes); + export default { showDialog }; \ No newline at end of file diff --git a/src/public/javascripts/dialogs/jump_to_note.js b/src/public/javascripts/dialogs/jump_to_note.js index 32b5cce11..0fd59e0a1 100644 --- a/src/public/javascripts/dialogs/jump_to_note.js +++ b/src/public/javascripts/dialogs/jump_to_note.js @@ -1,11 +1,11 @@ import treeService from '../services/tree.js'; -import linkService from '../services/link.js'; import server from '../services/server.js'; import searchNotesService from '../services/search_notes.js'; const $dialog = $("#jump-to-note-dialog"); const $autoComplete = $("#jump-to-note-autocomplete"); const $showInFullTextButton = $("#show-in-full-text-button"); +const $showRecentNotesButton = $("#jump-to-note-show-recent-notes"); async function showDialog() { glob.activeDialog = $dialog; @@ -48,7 +48,7 @@ async function showDialog() { } }); - $autoComplete.autocomplete("search", ""); + showRecentNotes(); } function showInFullText(e) { @@ -65,8 +65,14 @@ function showInFullText(e) { $dialog.dialog('close'); } +function showRecentNotes() { + $autoComplete.autocomplete("search", ""); +} + $showInFullTextButton.click(showInFullText); +$showRecentNotesButton.click(showRecentNotes); + $dialog.bind('keydown', 'ctrl+return', showInFullText); export default { diff --git a/src/public/javascripts/dialogs/labels.js b/src/public/javascripts/dialogs/labels.js index 32f0666b6..7855334a5 100644 --- a/src/public/javascripts/dialogs/labels.js +++ b/src/public/javascripts/dialogs/labels.js @@ -1,5 +1,4 @@ import noteDetailService from '../services/note_detail.js'; -import utils from '../services/utils.js'; import server from '../services/server.js'; import infoService from "../services/info.js"; diff --git a/src/views/index.ejs b/src/views/index.ejs index 95f83358f..bc8c413c3 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -279,27 +279,36 @@
    - + +
    + + + +
    - +