Skip to content

Commit

Permalink
Merge branch 'master' into easy-styling
Browse files Browse the repository at this point in the history
  • Loading branch information
zjosua authored Apr 2, 2022
2 parents 6c7c6a4 + acf98d1 commit d41fb99
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions card/back.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@
if (options.atable.colorize) {
if (solutions[i] && answers[i] === "1") {
arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.correctcorrect);
canswers = canswers + 1;
} else if (!solutions[i] && answers[i] === "0") {
arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.wrongwrong);
canswers = canswers + 1;
} else if (!solutions[i] && answers[i] === "1") {
arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.wrongcorrect);
} else if (solutions[i] && answers[i] === "0") {
Expand Down
4 changes: 2 additions & 2 deletions src/multiple_choice/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@

# default configurations
# TODO: update version number before release
default_conf_local = {'version': "2.4.2"}
default_conf_syncd = {'version': "2.4.2"}
default_conf_local = {'version': "2.4.3"}
default_conf_syncd = {'version': "2.4.3"}

def getSyncedConfig():
# Synced preferences
Expand Down
2 changes: 0 additions & 2 deletions src/multiple_choice/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,8 @@
if (options.atable.colorize) {
if (solutions[i] && answers[i] === "1") {
arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.correctcorrect);
canswers = canswers + 1;
} else if (!solutions[i] && answers[i] === "0") {
arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.wrongwrong);
canswers = canswers + 1;
} else if (!solutions[i] && answers[i] === "1") {
arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.wrongcorrect);
} else if (solutions[i] && answers[i] === "0") {
Expand Down

0 comments on commit d41fb99

Please sign in to comment.