mirror of
https://github.com/zadam/trilium.git
synced 2025-02-20 21:13:11 +08:00
fix refocusing find widget, closes #3252
This commit is contained in:
parent
64d3ec940c
commit
521d95021b
2 changed files with 15 additions and 14 deletions
4
package-lock.json
generated
4
package-lock.json
generated
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "trilium",
|
||||
"version": "0.56.1",
|
||||
"version": "0.56.2",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "trilium",
|
||||
"version": "0.56.1",
|
||||
"version": "0.56.2",
|
||||
"hasInstallScript": true,
|
||||
"license": "AGPL-3.0-only",
|
||||
"dependencies": {
|
||||
|
|
|
@ -142,26 +142,27 @@ export default class FindWidget extends NoteContextAwareWidget {
|
|||
return;
|
||||
}
|
||||
|
||||
if (!['text', 'code', 'render'].includes(this.note.type) || !this.$findBox.is(":hidden")) {
|
||||
if (!['text', 'code', 'render'].includes(this.note.type)) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.handler = await this.getHandler();
|
||||
|
||||
this.$findBox.show();
|
||||
this.$input.focus();
|
||||
this.$totalFound.text(0);
|
||||
this.$currentFound.text(0);
|
||||
this.handler = await this.getHandler();
|
||||
|
||||
const searchTerm = await this.handler.getInitialSearchTerm();
|
||||
const isAlreadyVisible = this.$findBox.is(":visible");
|
||||
|
||||
this.$input.val(searchTerm || "");
|
||||
|
||||
// Directly perform the search if there's some text to
|
||||
// find, without delaying or waiting for enter
|
||||
if (searchTerm !== "") {
|
||||
if (isAlreadyVisible) {
|
||||
this.$input.select();
|
||||
await this.performFind();
|
||||
} else {
|
||||
this.$totalFound.text(0);
|
||||
this.$currentFound.text(0);
|
||||
const searchTerm = await this.handler.getInitialSearchTerm();
|
||||
this.$input.val(searchTerm || "");
|
||||
if (searchTerm !== "") {
|
||||
this.$input.select();
|
||||
await this.performFind();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue