diff --git a/src/public/app/dialogs/jump_to_note.js b/src/public/app/dialogs/jump_to_note.js index 05eef54c6..5128593f4 100644 --- a/src/public/app/dialogs/jump_to_note.js +++ b/src/public/app/dialogs/jump_to_note.js @@ -30,9 +30,8 @@ function showInFullText(e) { const searchText = $autoComplete.val(); - searchNotesService.resetSearch(); - searchNotesService.showSearch(); - searchNotesService.doSearch(searchText); + appContext.triggerCommand('showSearch', {searchText}); + appContext.triggerCommand('searchForResults', {searchText}); $dialog.modal('hide'); } diff --git a/src/public/app/widgets/search_box.js b/src/public/app/widgets/search_box.js index cce532372..2272d598f 100644 --- a/src/public/app/widgets/search_box.js +++ b/src/public/app/widgets/search_box.js @@ -122,7 +122,7 @@ export default class SearchBoxWidget extends BasicWidget { this.resetSearchEvent(); } - showSearchEvent() { + showSearchEvent({searchText}) { utils.saveFocusedElement(); this.$searchBox.slideDown(); @@ -138,6 +138,10 @@ export default class SearchBoxWidget extends BasicWidget { } }); + if (searchText) { + this.$searchInput.val(searchText); + } + this.$searchInput.trigger('focus'); } diff --git a/src/public/app/widgets/search_results.js b/src/public/app/widgets/search_results.js index 08b0e6f76..094fa4444 100644 --- a/src/public/app/widgets/search_results.js +++ b/src/public/app/widgets/search_results.js @@ -1,6 +1,4 @@ import BasicWidget from "./basic_widget.js"; -import toastService from "../services/toast.js"; -import server from "../services/server.js"; const TPL = `