Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

unified Jump-To and quick search behavior with regards to hoisting and opening in a new tab

Browse Source
This commit is contained in:
zadam
2022-01-10 20:44:59 +01:00
parent 6f406f9aa2
commit 91e78998d1
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,10 @@ export default class RootCommandExecutor extends Component {
// force immediate search // force immediate search
await froca.loadSearchNote(searchNote.noteId); await froca.loadSearchNote(searchNote.noteId);
const noteContext = await appContext.tabManager.openContextWithNote(searchNote.noteId, true); const activeNoteContext = appContext.tabManager.getActiveContext();
const hoistedNoteId = activeNoteContext?.hoistedNoteId || 'root';
const noteContext = await appContext.tabManager.openContextWithNote(searchNote.noteId, true, null, hoistedNoteId);
appContext.triggerCommand('focusOnSearchDefinition', {ntxId: noteContext.ntxId}); appContext.triggerCommand('focusOnSearchDefinition', {ntxId: noteContext.ntxId});
} }

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

@@ -206,7 +206,7 @@ export default class TabManager extends Component {
await noteContext.setEmpty(); await noteContext.setEmpty();
} }
async openEmptyTab(ntxId, hoistedNoteId = 'root', mainNtxId = null) { async openEmptyTab(ntxId = null, hoistedNoteId = 'root', mainNtxId = null) {
const noteContext = new NoteContext(ntxId, hoistedNoteId, mainNtxId); const noteContext = new NoteContext(ntxId, hoistedNoteId, mainNtxId);
const existingNoteContext = this.children.find(nc => nc.ntxId === noteContext.ntxId); const existingNoteContext = this.children.find(nc => nc.ntxId === noteContext.ntxId);
@@ -240,7 +240,7 @@ export default class TabManager extends Component {
return this.openContextWithNote(notePath, activate, null, hoistedNoteId); return this.openContextWithNote(notePath, activate, null, hoistedNoteId);
} }
async openContextWithNote(notePath, activate, ntxId, hoistedNoteId = 'root', mainNtxId = null) { async openContextWithNote(notePath, activate, ntxId = null, hoistedNoteId = 'root', mainNtxId = null) {
const noteContext = await this.openEmptyTab(ntxId, hoistedNoteId, mainNtxId); const noteContext = await this.openEmptyTab(ntxId, hoistedNoteId, mainNtxId);
if (notePath) { if (notePath) {

8
src/public/app/widgets/quick_search.js
View File

@@ -150,11 +150,9 @@ export default class QuickSearchWidget extends BasicWidget {
async showInFullSearch() { async showInFullSearch() {
this.$dropdownToggle.dropdown("hide"); this.$dropdownToggle.dropdown("hide");
const searchNote = await dateNotesService.createSearchNote({searchString: this.$searchString.val()}); await appContext.triggerCommand('searchNotes', {
searchString: this.$searchString.val()
await froca.loadSearchNote(searchNote.noteId); });
await appContext.tabManager.getActiveContext().setNote(searchNote.noteId);
} }
quickSearchEvent() { quickSearchEvent() {