Merge branch 'stable'

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.37.2",
+  "version": "0.37.3",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {

src/public/javascripts/services/search_notes.js

@@ -142,6 +142,12 @@ async function refreshSearch() {
     toastService.showMessage("Saved search note refreshed.");
 }
 
+function searchInSubtree(noteId) {
+    showSearch();
+
+    $searchInput.val(`@in=${noteId} @text*=*`);
+}
+
 function init() {
     const hashValue = document.location.hash ? document.location.hash.substr(1) : ""; // strip initial #
 
@@ -178,5 +184,6 @@ export default {
     refreshSearch,
     doSearch,
     init,
+    searchInSubtree,
     getHelpText: () => helpText
 };

src/public/javascripts/services/tree_context_menu.js

@@ -9,6 +9,7 @@ import hoistedNoteService from './hoisted_note.js';
 import noteDetailService from './note_detail.js';
 import clipboard from './clipboard.js';
 import protectedSessionHolder from "./protected_session_holder.js";
+import searchNotesService from "./search_notes.js";
 
 class TreeContextMenu {
     constructor(node) {
@@ -55,6 +56,8 @@ class TreeContextMenu {
             { title: "Delete <kbd>Delete</kbd>", cmd: "delete", uiIcon: "trash",
                 enabled: isNotRoot && !isHoisted && parentNotSearch },
             { title: "----" },
+            { title: "Search in subtree <kbd>Ctrl+Shift+S</kbd>", cmd: "searchInSubtree", uiIcon: "search",
+                enabled: notSearch && noSelectedNotes },
             isHoisted ? null : { title: "Hoist note <kbd>Ctrl-H</kbd>", cmd: "hoist", uiIcon: "empty", enabled: noSelectedNotes && notSearch },
             !isHoisted || !isNotRoot ? null : { title: "Unhoist note <kbd>Ctrl-H</kbd>", cmd: "unhoist", uiIcon: "arrow-up" },
             { title: "Edit branch prefix <kbd>F2</kbd>", cmd: "editBranchPrefix", uiIcon: "empty",
@@ -177,6 +180,9 @@ class TreeContextMenu {
 
             treeService.duplicateNote(this.node.data.noteId, branch.parentNoteId);
         }
+        else if (cmd === "searchInSubtree") {
+            searchNotesService.searchInSubtree(this.node.data.noteId);
+        }
         else {
             ws.logError("Unknown command: " + cmd);
         }

src/public/javascripts/services/tree_keybindings.js

@@ -4,6 +4,7 @@ import treeService from "./tree.js";
 import hoistedNoteService from "./hoisted_note.js";
 import clipboard from "./clipboard.js";
 import treeCache from "./tree_cache.js";
+import searchNoteService from "./search_notes.js";
 
 const keyBindings = {
     "del": node => {
@@ -167,6 +168,11 @@ const keyBindings = {
     "down": node => {
         node.navigate($.ui.keyCode.DOWN, true).then(treeService.clearSelectedNodes);
 
+        return false;
+    },
+    "ctrl+shift+s": node => {
+        searchNoteService.searchInSubtree(node.data.noteId);
+
         return false;
     }
 };

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2019-11-18T23:04:09+01:00", buildRevision: "834e1f7253186922d2b5df2f6a01c34f7c2d7fe4" };
+module.exports = { buildDate:"2019-11-19T23:05:54+01:00", buildRevision: "07043fb177afb9d754428a410b3019d53d7b6fa0" };