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

handle empty search note

Browse Source
This commit is contained in:
zadam
2019-03-20 21:01:00 +01:00
parent 616829464f
commit 9ca680f842
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/services/note_detail_search.js
View File

@@ -9,8 +9,6 @@ const $refreshButton = $('#note-detail-search-refresh-results-button');
function show() { function show() {
$component.show(); $component.show();
console.log(noteDetailService.getActiveNote());
try { try {
const json = JSON.parse(noteDetailService.getActiveNote().noteContent.content); const json = JSON.parse(noteDetailService.getActiveNote().noteContent.content);

11
src/public/javascripts/services/tree_builder.js
View File

@@ -116,8 +116,19 @@ async function prepareRealBranch(parentNote) {
async function prepareSearchBranch(note) { async function prepareSearchBranch(note) {
const fullNote = await noteDetailService.loadNote(note.noteId); const fullNote = await noteDetailService.loadNote(note.noteId);
console.log("ZZZ", fullNote.noteContent.content);
if (!fullNote.noteContent.content || !fullNote.noteContent.content.trim()) {
return [];
}
const json = JSON.parse(fullNote.noteContent.content); const json = JSON.parse(fullNote.noteContent.content);
if (!json.searchString || !json.searchString.trim()) {
return [];
}
const results = (await server.get('search/' + encodeURIComponent(json.searchString))) const results = (await server.get('search/' + encodeURIComponent(json.searchString)))
.filter(res => res.noteId !== note.noteId); // this is necessary because title of the search note is often the same as the search text which would match and create circle .filter(res => res.noteId !== note.noteId); // this is necessary because title of the search note is often the same as the search text which would match and create circle