commit 6814f2bdb0996ddb1eaa454e22520b29cb4a7a5f
parent cd490da8be5b04d0e2b1190696625cfeaf84d28d
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Mon, 8 Jun 2020 15:44:44 -0700
Refactor Check method to improve skip feature.
Diffstat:
2 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/Scripts/Quizzer.js b/Scripts/Quizzer.js
@@ -371,7 +371,7 @@ function Reset() {
responce += `${result.transcript}, `;
}
document.getElementById("quizzerInput").value = responce;
- Check()
+ Submit()
};
}
}
@@ -402,8 +402,8 @@ function quizzerPromptClicked() {
-// Check the user's responce
-function Check() {
+// Processes a user's submitted responce
+function Submit() {
// Parse responce
var responce = document.getElementById("quizzerInput").value.toLowerCase(); // Make responce lowercase
responce = responce.replace(/a`/g, "รก"); // Apply accented a shortcut
@@ -445,25 +445,33 @@ function Check() {
document.getElementById("quizzerCongrats").hidden = true;
document.getElementById("quizzerFeedback").scrollIntoView(false);
document.getElementById("quizzerInput").focus();
-
- // Repeat prompt
- switch (document.getElementById("settingsRepeatPrompts").value)
- {
- case "Never": // Don't repeat
- break;
- case "Immediately": // Repeat imitiately
- Term--;
- break;
- case "5 prompts later":
- var temp = Terms[Term];
- Terms.splice(Term, 1);
- Terms.splice(Term + 5, 0, temp);
- Term--;
- break;
- }
}
else {
// Responce was correct
Reset();
}
-}
-\ No newline at end of file
+}
+
+
+
+// Processes an incorrect responce and then resets the quizzer
+function Continue() {
+ // Repeat prompt
+ switch (document.getElementById("settingsRepeatPrompts").value)
+ {
+ case "Never": // Don't repeat
+ break;
+ case "Immediately": // Repeat imitiately
+ Term--;
+ break;
+ case "5 prompts later":
+ var temp = Terms[Term];
+ Terms.splice(Term, 1);
+ Terms.splice(Term + 5, 0, temp);
+ Term--;
+ break;
+ }
+
+ // Reset quizzer
+ Reset();
+}
diff --git a/Scripts/Settings.js b/Scripts/Settings.js
@@ -29,19 +29,19 @@ function Load() {
if (e.keyCode === 13) {
// Key was enter
if (document.getElementById("quizzerInput").readOnly) {
- Reset();
+ Continue();
}
else {
- Check();
+ Submit();
}
}
});
document.getElementById("quizzerEnter").addEventListener("click", function (e) {
if (document.getElementById("quizzerInput").readOnly) {
- Reset();
+ Continue();
}
else {
- Check();
+ Submit();
}
});