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

refactoring and fixes for saved note

Browse Source
This commit is contained in:
zadam
2020-02-14 20:18:09 +01:00
parent 380bb0cd01
commit 8d2c2202fa
8 changed files with 45 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/public/javascripts/widgets/search_box.js
View File

@@ -1,6 +1,4 @@
import BasicWidget from "./basic_widget.js";
import searchService from "../services/search_notes.js";
import treeCache from "../services/tree_cache.js";
import toastService from "../services/toast.js";
import appContext from "../services/app_context.js";
import noteCreateService from "../services/note_create.js";
@@ -109,14 +107,13 @@ export default class SearchBoxWidget extends BasicWidget {
}
// FIXME
let activeNode = appContext.getMainNoteTree().getActiveNode();
const parentNote = await treeCache.getNote(activeNode.data.noteId);
let activeNote = appContext.tabManager.getActiveTabNote();
if (parentNote.type === 'search') {
activeNode = activeNode.getParent();
if (activeNote.type === 'search') {
activeNote = (await activeNote.getParentNotes())[0];
}
await noteCreateService.createNote(activeNode.data.noteId, {
await noteCreateService.createNote(activeNote.noteId, {
type: "search",
mime: "application/json",
title: searchString,
@@ -134,7 +131,7 @@ export default class SearchBoxWidget extends BasicWidget {
this.$searchBox.tooltip({
trigger: 'focus',
html: true,
title: searchService.getHelpText(),
title: window.glob.SEARCH_HELP_TEXT,
placement: 'right',
delay: {
show: 500, // necessary because sliding out may cause wrong position