GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-06 12:47:11 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'upstream/main' into svelte-reviewer-bottom

Browse source
This commit is contained in:
Luc Mcgrady 2025-10-30 15:49:29 +00:00
commit 4897ea8173
No known key found for this signature in database
GPG key ID: 4F3D7A0B17CC3D9C
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CONTRIBUTORS
View file

@ -189,7 +189,7 @@ Christian Donat <https://github.com/cdonat2>
Asuka Minato <https://asukaminato.eu.org> Asuka Minato <https://asukaminato.eu.org>
Dillon Baldwin <https://github.com/DillBal> Dillon Baldwin <https://github.com/DillBal>
Voczi <https://github.com/voczi> Voczi <https://github.com/voczi>
Ben Nguyen <105088397+bpnguyen107@users.noreply.github.com> Ben Nguyen <105088397+bpnguyen107@users.noreply.github.com>
Themis Demetriades <themis100@outlook.com> Themis Demetriades <themis100@outlook.com>
Luke Bartholomew <lukesbart@icloud.com> Luke Bartholomew <lukesbart@icloud.com>
Gregory Abrasaldo <degeemon@gmail.com> Gregory Abrasaldo <degeemon@gmail.com>
@ -253,6 +253,7 @@ arold0 <arold0@icloud.com>
nav1s <nav1s@proton.me> nav1s <nav1s@proton.me>
Ranjit Odedra <ranjitodedra.dev@gmail.com> Ranjit Odedra <ranjitodedra.dev@gmail.com>
Eltaurus <https://github.com/Eltaurus-Lt> Eltaurus <https://github.com/Eltaurus-Lt>
jariji
******************** ********************

2
rslib/proto/python.rs
View file

@ -22,7 +22,7 @@ pub(crate) fn write_python_interface(services: &[BackendService]) -> Result<()>
write_header(&mut out)?; write_header(&mut out)?;
for service in services { for service in services {
if service.name == "BackendAnkidroidService" { if ["BackendAnkidroidService", "BackendFrontendService"].contains(&service.name.as_str()) {
continue; continue;
} }
for method in service.all_methods() { for method in service.all_methods() {

4
rslib/src/cloze.rs
View file

@ -260,7 +260,6 @@ fn reveal_cloze(
image_occlusion_text, image_occlusion_text,
question, question,
active, active,
cloze_ord,
&cloze.ordinals, &cloze.ordinals,
)); ));
return; return;
@ -332,10 +331,9 @@ fn render_image_occlusion(
text: &str, text: &str,
question_side: bool, question_side: bool,
active: bool, active: bool,
ordinal: u16,
ordinals: &[u16], ordinals: &[u16],
) -> String { ) -> String {
if (question_side && active) || ordinal == 0 { if (question_side && active) || ordinals.contains(&0) {
format!( format!(
r#"<div class="cloze" data-ordinal="{}" {}></div>"#, r#"<div class="cloze" data-ordinal="{}" {}></div>"#,
ordinals_str(ordinals), ordinals_str(ordinals),