From e44c7c9947fbb4a3fe83b24696d32d73002bed16 Mon Sep 17 00:00:00 2001 From: azivner Date: Wed, 14 Nov 2018 11:28:52 +0100 Subject: [PATCH] hide "go to selected note" button in jump because it doesn't make sense there --- src/public/javascripts/dialogs/jump_to_note.js | 4 +--- .../javascripts/services/note_autocomplete.js | 15 +++++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/public/javascripts/dialogs/jump_to_note.js b/src/public/javascripts/dialogs/jump_to_note.js index 17ec5d29e..f74fe0e7b 100644 --- a/src/public/javascripts/dialogs/jump_to_note.js +++ b/src/public/javascripts/dialogs/jump_to_note.js @@ -15,15 +15,13 @@ async function showDialog() { $dialog.modal(); - noteAutocompleteService.initNoteAutocomplete($autoComplete) + noteAutocompleteService.initNoteAutocomplete($autoComplete, { hideGoToSelectedNoteButton: true }) .on('autocomplete:selected', function(event, suggestion, dataset) { if (!suggestion.path) { return false; } treeService.activateNote(suggestion.path); - - $dialog.modal('hide'); }); noteAutocompleteService.showRecentNotes($autoComplete); diff --git a/src/public/javascripts/services/note_autocomplete.js b/src/public/javascripts/services/note_autocomplete.js index c1e926f92..8396aaf89 100644 --- a/src/public/javascripts/services/note_autocomplete.js +++ b/src/public/javascripts/services/note_autocomplete.js @@ -30,8 +30,10 @@ function showRecentNotes($el) { $el.autocomplete("open"); } -function initNoteAutocomplete($el) { +function initNoteAutocomplete($el, options) { if (!$el.hasClass("note-autocomplete-input")) { + options = options || {}; + $el.addClass("note-autocomplete-input"); const $clearTextButton = $("") @@ -46,11 +48,16 @@ function initNoteAutocomplete($el) { .addClass("input-group-text go-to-selected-note-button jam jam-arrow-right") .prop("title", "Go to selected note"); - $el.after($("
") + const $sideButtons = $("
") .addClass("input-group-append") .append($clearTextButton) - .append($showRecentNotesButton) - .append($goToSelectedNoteButton)); + .append($showRecentNotesButton); + + if (!options.hideGoToSelectedNoteButton) { + $sideButtons.append($goToSelectedNoteButton); + } + + $el.after($sideButtons); $clearTextButton.click(() => clearText($el));