From 6f406f9aa2a1c7e64a05d2b71a34da92727dbdb5 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 10 Jan 2022 20:37:33 +0100 Subject: [PATCH] search immediately when user chooses "full search" from Jump To dialog, #2483 --- src/public/app/services/app_context.js | 2 +- src/public/app/services/root_command_executor.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/public/app/services/app_context.js b/src/public/app/services/app_context.js index a84477da6..f48ecef4f 100644 --- a/src/public/app/services/app_context.js +++ b/src/public/app/services/app_context.js @@ -118,7 +118,7 @@ class AppContext extends Component { const appContext = new AppContext(window.glob.isMainWindow); // we should save all outstanding changes before the page/app is closed -$(window).on('beforeunload', () => {return "SSS"; +$(window).on('beforeunload', () => { let allSaved = true; appContext.beforeUnloadListeners = appContext.beforeUnloadListeners.filter(wr => !!wr.deref()); diff --git a/src/public/app/services/root_command_executor.js b/src/public/app/services/root_command_executor.js index 4aaf9d70c..909ccd716 100644 --- a/src/public/app/services/root_command_executor.js +++ b/src/public/app/services/root_command_executor.js @@ -5,6 +5,7 @@ import treeService from "../services/tree.js"; import openService from "./open.js"; import protectedSessionService from "./protected_session.js"; import options from "./options.js"; +import froca from "./froca.js"; export default class RootCommandExecutor extends Component { jumpToNoteCommand() { @@ -72,6 +73,9 @@ export default class RootCommandExecutor extends Component { async searchNotesCommand({searchString, ancestorNoteId}) { const searchNote = await dateNoteService.createSearchNote({searchString, ancestorNoteId}); + // force immediate search + await froca.loadSearchNote(searchNote.noteId); + const noteContext = await appContext.tabManager.openContextWithNote(searchNote.noteId, true); appContext.triggerCommand('focusOnSearchDefinition', {ntxId: noteContext.ntxId});