find box can be used also on render notes

This commit is contained in:
zadam
2022-07-10 22:01:21 +02:00
parent 570fabdc4a
commit 0c4e5d2a19
2 changed files with 36 additions and 12 deletions

View File

@@ -142,19 +142,11 @@ export default class FindWidget extends NoteContextAwareWidget {
return;
}
if (!['text', 'code'].includes(this.note.type) || !this.$findBox.is(":hidden")) {
if (!['text', 'code', 'render'].includes(this.note.type) || !this.$findBox.is(":hidden")) {
return;
}
const readOnly = await this.noteContext.isReadOnly();
if (readOnly) {
this.handler = this.htmlHandler;
} else {
this.handler = this.note.type === "code"
? this.codeHandler
: this.textHandler;
}
this.handler = await this.getHandler();
this.$findBox.show();
this.$input.focus();
@@ -173,6 +165,22 @@ export default class FindWidget extends NoteContextAwareWidget {
}
}
async getHandler() {
if (this.note.type === 'render') {
return this.htmlHandler;
}
const readOnly = await this.noteContext.isReadOnly();
if (readOnly) {
return this.htmlHandler;
} else {
return this.note.type === "code"
? this.codeHandler
: this.textHandler;
}
}
startSearch() {
// XXX This should clear the previous search immediately in all cases
// (the search is stale when waitforenter but also while the
@@ -250,6 +258,6 @@ export default class FindWidget extends NoteContextAwareWidget {
}
isEnabled() {
return super.isEnabled() && ['text', 'code'].includes(this.note.type);
return super.isEnabled() && ['text', 'code', 'render'].includes(this.note.type);
}
}