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

cleanup of find in text implementation

Browse Source
This commit is contained in:
zadam
2023-05-18 13:41:32 +02:00
parent 1089e84f56
commit 074820dae5
4 changed files with 12 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/public/app/widgets/find.js
View File

@@ -145,10 +145,10 @@ export default class FindWidget extends NoteContextAwareWidget {
if (!['text', 'code', 'render'].includes(this.note.type)) {
return;
}
this.handler = await this.getHandler();
var searchTerm = await this.handler.getInitialSearchTerm();
searchTerm = searchTerm=="" ? window.getSelection().toString():searchTerm;
const selectedText = window.getSelection().toString() || "";
this.$findBox.show();
this.$input.focus();
@@ -156,18 +156,21 @@ export default class FindWidget extends NoteContextAwareWidget {
const isAlreadyVisible = this.$findBox.is(":visible");
if (isAlreadyVisible) {
this.$input.val(searchTerm || "");
if (searchTerm !== "") {
this.$input.select();
if (selectedText) {
this.$input.val(selectedText);
}
if (this.$input.val()) {
await this.performFind();
}
this.$input.select();
} else {
this.$totalFound.text(0);
this.$currentFound.text(0);
searchTerm = await this.handler.getInitialSearchTerm();
this.$input.val(searchTerm || "");
if (searchTerm !== "") {
this.$input.val(selectedText);
if (selectedText) {
this.$input.select();
await this.performFind();
}