GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2026-01-09 03:53:55 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix: Prevent playAvTags call with empty tags

Browse source
This commit is contained in:
Luc Mcgrady 2025-11-23 09:36:20 +00:00
parent 05223e1129
commit 0e7ec3588a
No known key found for this signature in database
GPG key ID: 4F3D7A0B17CC3D9C
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ts/routes/reviewer/reviewer.ts
View file

@ -1,5 +1,6 @@
// Copyright: Ankitects Pty Ltd and contributors // Copyright: Ankitects Pty Ltd and contributors
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import type { AVTag } from "@generated/anki/card_rendering_pb";
import type { UndoStatus } from "@generated/anki/collection_pb"; import type { UndoStatus } from "@generated/anki/collection_pb";
import { DeckConfig_Config_AnswerAction, DeckConfig_Config_QuestionAction } from "@generated/anki/deck_config_pb"; import { DeckConfig_Config_AnswerAction, DeckConfig_Config_QuestionAction } from "@generated/anki/deck_config_pb";
import { ReviewerActionRequest_ReviewerAction } from "@generated/anki/frontend_pb"; import { ReviewerActionRequest_ReviewerAction } from "@generated/anki/frontend_pb";
@ -105,7 +106,7 @@ export class ReviewerState {
switch (e.data.type) { switch (e.data.type) {
case "audio": { case "audio": {
const tags = get(this.answerShown) ? this._cardData!.answerAvTags : this._cardData!.questionAvTags; const tags = get(this.answerShown) ? this._cardData!.answerAvTags : this._cardData!.questionAvTags;
playAvtags({ tags: [tags[e.data.index]] }); this.playAudio([tags[e.data.index]]);
break; break;
} }
case "typed": { case "typed": {
@ -173,11 +174,23 @@ export class ReviewerState {
this.reviewerAction(ReviewerActionRequest_ReviewerAction.Overview); this.reviewerAction(ReviewerActionRequest_ReviewerAction.Overview);
} }
public playAudio(tags: AVTag[]) {
if (tags.length) {
playAvtags({ tags });
}
}
maybeAutoPlayAudio(tags: AVTag[]) {
if (this._cardData?.autoplay) {
this.playAudio(tags);
}
}
public replayAudio() { public replayAudio() {
if (this._answerShown) { if (this._answerShown) {
playAvtags({ tags: this._cardData!.answerAvTags }); this.playAudio(this._cardData!.answerAvTags);
} else { } else {
playAvtags({ tags: this._cardData!.questionAvTags }); this.playAudio(this._cardData!.questionAvTags);
} }
} }
@ -415,10 +428,7 @@ export class ReviewerState {
const question = resp.nextCard?.front || ""; const question = resp.nextCard?.front || "";
this.updateHtml(question, resp?.nextCard?.css, resp?.nextCard?.bodyClass); this.updateHtml(question, resp?.nextCard?.css, resp?.nextCard?.bodyClass);
this.iframe!.style.visibility = "visible"; this.iframe!.style.visibility = "visible";
if (this._cardData?.autoplay) { this.maybeAutoPlayAudio(this._cardData.questionAvTags);
playAvtags({ tags: this._cardData!.questionAvTags });
}
this.beginAnsweringMs = Date.now(); this.beginAnsweringMs = Date.now();
this.answerMs = undefined; this.answerMs = undefined;
this.updateAutoAdvanceQuestion(); this.updateAutoAdvanceQuestion();
@ -447,9 +457,7 @@ export class ReviewerState {
public async showAnswer() { public async showAnswer() {
this.answerShown.set(true); this.answerShown.set(true);
if (this._cardData?.autoplay) { this.maybeAutoPlayAudio(this._cardData!.answerAvTags);
playAvtags({ tags: this._cardData!.answerAvTags });
}
this.answerMs = Date.now(); this.answerMs = Date.now();
this.updateHtml(await this.showTypedAnswer(this._cardData?.back || "")); this.updateHtml(await this.showTypedAnswer(this._cardData?.back || ""));
this.updateAutoAdvanceAnswer(); this.updateAutoAdvanceAnswer();