monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2024-09-20 07:16:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

made sure to show if test was invalid

Browse source 
fixed source showing in wrong mode
This commit is contained in:
Jack 2020-07-03 01:32:02 +01:00
parent 1f83d05c22
commit 7f95a0599a
1 changed files with 81 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

159
public/js/script.js
View file

@ -752,84 +752,6 @@ function showResult(difficultyFailed = false) {
mode2 = "custom";
}
if (firebase.auth().currentUser != null) {
$("#result .loginTip").addClass('hidden');
} else {
$("#result .loginTip").removeClass('hidden');
}
let testType = "";
testType += config.mode;
if (config.mode == "time") {
testType += " " + config.time
} else if (config.mode == "words") {
testType += " " + config.words
}
if (config.mode != "custom") {
testType += "<br>" + config.language.replace('_', ' ');
}
if (config.punctuation) {
testType += "<br>punctuation"
}
if (config.blindMode) {
testType += "<br>blind"
}
if (config.difficulty == "expert") {
testType += "<br>expert";
} else if (config.difficulty == "master") {
testType += "<br>master";
}
$("#result .stats .testType .bottom").html(testType);
let otherText = "";
if (difficultyFailed) {
otherText += "<br>failed"
}
if (afkDetected) {
otherText += "<br>afk detected"
}
if (testInvalid) {
otherText += "<br>invalid"
}
if (sameWordset) {
otherText += "<br>repeated"
}
if (otherText == "") {
$("#result .stats .info").addClass('hidden');
} else {
$("#result .stats .info").removeClass('hidden');
otherText = otherText.substring(4);
$("#result .stats .info .bottom").html(otherText);
}
let tagsText = "";
try {
dbSnapshot.tags.forEach(tag => {
if (tag.active === true) {
tagsText += "<br>" + tag.name;
}
})
} catch (e) {
}
if (tagsText == "") {
$("#result .stats .tags").addClass('hidden');
} else {
$("#result .stats .tags").removeClass('hidden');
tagsText = tagsText.substring(4);
$("#result .stats .tags .bottom").html(tagsText);
}
$("#result .stats .source .bottom").html(randomQuote.source);
let labels = [];
for (let i = 1; i <= wpmHistory.length; i++) {
labels.push(i.toString());
@ -999,6 +921,87 @@ function showResult(difficultyFailed = false) {
}
}
if (firebase.auth().currentUser != null) {
$("#result .loginTip").addClass('hidden');
} else {
$("#result .loginTip").removeClass('hidden');
}
let testType = "";
testType += config.mode;
if (config.mode == "time") {
testType += " " + config.time
} else if (config.mode == "words") {
testType += " " + config.words
}
if (config.mode != "custom") {
testType += "<br>" + config.language.replace('_', ' ');
}
if (config.punctuation) {
testType += "<br>punctuation"
}
if (config.blindMode) {
testType += "<br>blind"
}
if (config.difficulty == "expert") {
testType += "<br>expert";
} else if (config.difficulty == "master") {
testType += "<br>master";
}
$("#result .stats .testType .bottom").html(testType);
let otherText = "";
if (difficultyFailed) {
otherText += "<br>failed"
}
if (afkDetected) {
otherText += "<br>afk detected"
}
if (testInvalid) {
otherText += "<br>invalid"
}
if (sameWordset) {
otherText += "<br>repeated"
}
if (otherText == "") {
$("#result .stats .info").addClass('hidden');
} else {
$("#result .stats .info").removeClass('hidden');
otherText = otherText.substring(4);
$("#result .stats .info .bottom").html(otherText);
}
let tagsText = "";
try {
dbSnapshot.tags.forEach(tag => {
if (tag.active === true) {
tagsText += "<br>" + tag.name;
}
})
} catch (e) {
}
if (tagsText == "") {
$("#result .stats .tags").addClass('hidden');
} else {
$("#result .stats .tags").removeClass('hidden');
tagsText = tagsText.substring(4);
$("#result .stats .tags .bottom").html(tagsText);
}
if(config.mode === "quote"){
$("#result .stats .source .bottom").html(randomQuote.source);
}
wpmOverTimeChart.options.scales.yAxes[0].ticks.max = maxChartVal;
wpmOverTimeChart.options.scales.yAxes[1].ticks.max = maxChartVal;