gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

search immediately when user chooses "full search" from Jump To dialog, #2483

Browse Source
This commit is contained in:
zadam 2022-01-10 20:37:33 +01:00
parent 86fa80f3eb
commit 6f406f9aa2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/services/app_context.js
View File

@ -118,7 +118,7 @@ class AppContext extends Component {
const appContext = new AppContext(window.glob.isMainWindow); const appContext = new AppContext(window.glob.isMainWindow);
// we should save all outstanding changes before the page/app is closed // we should save all outstanding changes before the page/app is closed
$(window).on('beforeunload', () => {return "SSS"; $(window).on('beforeunload', () => {
let allSaved = true; let allSaved = true;
appContext.beforeUnloadListeners = appContext.beforeUnloadListeners.filter(wr => !!wr.deref()); appContext.beforeUnloadListeners = appContext.beforeUnloadListeners.filter(wr => !!wr.deref());

4
src/public/app/services/root_command_executor.js
View File

@ -5,6 +5,7 @@ import treeService from "../services/tree.js";
import openService from "./open.js"; import openService from "./open.js";
import protectedSessionService from "./protected_session.js"; import protectedSessionService from "./protected_session.js";
import options from "./options.js"; import options from "./options.js";
import froca from "./froca.js";
export default class RootCommandExecutor extends Component { export default class RootCommandExecutor extends Component {
jumpToNoteCommand() { jumpToNoteCommand() {
@ -72,6 +73,9 @@ export default class RootCommandExecutor extends Component {
async searchNotesCommand({searchString, ancestorNoteId}) { async searchNotesCommand({searchString, ancestorNoteId}) {
const searchNote = await dateNoteService.createSearchNote({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); const noteContext = await appContext.tabManager.openContextWithNote(searchNote.noteId, true);
appContext.triggerCommand('focusOnSearchDefinition', {ntxId: noteContext.ntxId}); appContext.triggerCommand('focusOnSearchDefinition', {ntxId: noteContext.ntxId});