gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

redesign search buttons

Browse Source
This commit is contained in:
azivner 2018-03-13 20:02:00 -04:00
parent db514e8f41
commit efcc804149
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/public/javascripts/search_tree.js
View File

@ -3,7 +3,9 @@
const searchTree = (function() { const searchTree = (function() {
const $tree = $("#tree"); const $tree = $("#tree");
const $searchInput = $("input[name='search-text']"); const $searchInput = $("input[name='search-text']");
const $resetSearchButton = $("button#reset-search-button"); const $resetSearchButton = $("#reset-search-button");
const $doSearchButton = $("#do-search-button");
const $saveSearchButton = $("#save-search-button");
const $searchBox = $("#search-box"); const $searchBox = $("#search-box");
$resetSearchButton.click(resetSearch); $resetSearchButton.click(resetSearch);
@ -30,7 +32,20 @@ const searchTree = (function() {
return $tree.fancytree('getTree'); return $tree.fancytree('getTree');
} }
$searchInput.keyup(async e => { async function doSearch() {
const searchText = $searchInput.val();
const noteIds = await server.get('notes?search=' + encodeURIComponent(searchText));
for (const noteId of noteIds) {
await noteTree.expandToNote(noteId, {noAnimation: true, noEvents: true});
}
// Pass a string to perform case insensitive matching
getTree().filterBranches(node => noteIds.includes(node.data.noteId));
}
$searchInput.keyup(e => {
const searchText = $searchInput.val(); const searchText = $searchInput.val();
if (e && e.which === $.ui.keyCode.ESCAPE || $.trim(searchText) === "") { if (e && e.which === $.ui.keyCode.ESCAPE || $.trim(searchText) === "") {
@ -39,17 +54,14 @@ const searchTree = (function() {
} }
if (e && e.which === $.ui.keyCode.ENTER) { if (e && e.which === $.ui.keyCode.ENTER) {
const noteIds = await server.get('notes?search=' + encodeURIComponent(searchText)); doSearch();
for (const noteId of noteIds) {
await noteTree.expandToNote(noteId, {noAnimation: true, noEvents: true});
}
// Pass a string to perform case insensitive matching
getTree().filterBranches(node => noteIds.includes(node.data.noteId));
} }
}).focus(); }).focus();
$doSearchButton.click(doSearch);
$saveSearchButton.click(() => alert("Save search"));
$(document).bind('keydown', 'ctrl+s', e => { $(document).bind('keydown', 'ctrl+s', e => {
toggleSearch(); toggleSearch();

11
src/views/index.ejs
View File

@ -58,9 +58,14 @@
<div id="search-box" class="hide-toggle" style="grid-area: search; display: none; padding: 10px; margin-top: 10px;"> <div id="search-box" class="hide-toggle" style="grid-area: search; display: none; padding: 10px; margin-top: 10px;">
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<label>Search:</label> <input name="search-text" placeholder="Search text, attributes" style="flex-grow: 100; margin-left: 5px; margin-right: 5px;" autocomplete="off">
<input name="search-text" style="flex-grow: 100; margin-left: 5px; margin-right: 5px;" autocomplete="off"> <button id="do-search-button" class="btn btn-primary btn-sm" title="Search">Search</button>
<button id="reset-search-button" class="btn btn-sm" title="Reset search">&times;</button> </div>
<div style="display: flex; align-items: center; justify-content: space-evenly; margin-top: 10px;">
<button id="reset-search-button" class="btn btn-sm" title="Reset search">Reset search</button>
<button id="save-search-button" class="btn btn-sm" title="Save search">Save search</button>
</div> </div>
</div> </div>