From 42128c007fa109fd20944ea81946d2bb0a565364 Mon Sep 17 00:00:00 2001 From: zadam Date: Sat, 4 Apr 2020 22:49:30 +0200 Subject: [PATCH] fix "search in subtree", closes #941 --- src/public/javascripts/widgets/search_box.js | 6 +++--- src/services/notes.js | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/public/javascripts/widgets/search_box.js b/src/public/javascripts/widgets/search_box.js index d53202671..f0f729dfb 100644 --- a/src/public/javascripts/widgets/search_box.js +++ b/src/public/javascripts/widgets/search_box.js @@ -167,10 +167,10 @@ export default class SearchBoxWidget extends BasicWidget { this.$searchInput.val(""); } - searchInSubtreeEvent({noteId}) { - noteId = noteId || appContext.tabManager.getActiveTabNoteId(); + searchInSubtreeEvent({node}) { + const noteId = node.data.noteId; - this.toggleInt(true); + this.showSearchEvent(); this.$searchInput.val(`@in=${noteId} @text*=*`); } diff --git a/src/services/notes.js b/src/services/notes.js index 49de14d59..c312296ec 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -390,19 +390,12 @@ async function saveLinks(note, content) { const foundLinks = []; if (note.type === 'text') { - console.time("LINKS"); - content = findImageLinks(content, foundLinks); content = findInternalLinks(content, foundLinks); content = findExternalLinks(content, foundLinks); content = findIncludeNoteLinks(content, foundLinks); - console.timeEnd("LINKS"); - console.time("IMAGES"); - content = await downloadImages(note.noteId, content); - - console.timeEnd("IMAGES"); } else if (note.type === 'relation-map') { findRelationMapLinks(content, foundLinks);