monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-02-05 21:33:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

pressing any mod / special keys stops afk timer from increasing. closes #727

Browse source
This commit is contained in:
Jack 2020-12-17 16:53:25 +00:00
parent 74eb2b818f
commit 6613b3d187
1 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/js/script.js
View file

@ -20,6 +20,7 @@ let lineTransition = false;
let keypressPerSecond = [];
let currentKeypress = {
count: 0,
mod: 0,
words: [],
};
let errorsPerSecond = [];
@ -1025,7 +1026,9 @@ function compareInput(showError) {
}
let testNow = performance.now();
let testSeconds = Misc.roundTo2((testNow - testStart) / 1000);
let afkseconds = keypressPerSecond.filter((x) => x.count == 0).length;
let afkseconds = keypressPerSecond.filter(
(x) => x.count == 0 && x.mod == 0
).length;
incompleteTestSeconds += testSeconds - afkseconds;
restartCount++;
}
@ -1080,7 +1083,9 @@ function compareInput(showError) {
}
let testNow = performance.now();
let testSeconds = Misc.roundTo2((testNow - testStart) / 1000);
let afkseconds = keypressPerSecond.filter((x) => x.count == 0).length;
let afkseconds = keypressPerSecond.filter(
(x) => x.count == 0 && x.mod == 0
).length;
incompleteTestSeconds += testSeconds - afkseconds;
restartCount++;
}
@ -1754,7 +1759,8 @@ function showResult(difficultyFailed = false) {
}
clearTimeout(timer);
let testtime = stats.time;
let afkseconds = keypressPerSecond.filter((x) => x.count == 0).length;
let afkseconds = keypressPerSecond.filter((x) => x.count == 0 && x.mod == 0)
.length;
let afkSecondsPercent = Misc.roundTo2((afkseconds / testtime) * 100);
$("#result #resultWordsHistory").addClass("hidden");
@ -1873,6 +1879,7 @@ function showResult(difficultyFailed = false) {
rawHistory.push(wpmAndRaw.raw);
keypressPerSecond.push(currentKeypress);
currentKeypress = {
mod: 0,
count: 0,
words: [],
};
@ -1911,11 +1918,6 @@ function showResult(difficultyFailed = false) {
wpmOverTimeChart.data.labels = labels;
console.log(keypressPerSecond);
console.log(errorsPerSecond);
console.log(wpmHistory);
console.log(rawHistory);
let rawWpmPerSecondRaw = keypressPerSecond.map((f) =>
Math.round((f.count / 5) * 60)
);
@ -2685,6 +2687,7 @@ function startTest() {
keypressPerSecond.push(currentKeypress);
currentKeypress = {
mod: 0,
count: 0,
words: [],
};
@ -2775,6 +2778,7 @@ function restartTest(withSameWordset = false, nosave = false) {
keypressPerSecond = [];
lastSecondNotRound = false;
currentKeypress = {
mod: 0,
count: 0,
words: [],
};
@ -4262,7 +4266,9 @@ $(document).on("keypress", "#restartTestButton", (event) => {
if (testActive) {
let testNow = performance.now();
let testSeconds = Misc.roundTo2((testNow - testStart) / 1000);
let afkseconds = keypressPerSecond.filter((x) => x.count == 0).length;
let afkseconds = keypressPerSecond.filter(
(x) => x.count == 0 && x.mod == 0
).length;
incompleteTestSeconds += testSeconds - afkseconds;
restartCount++;
}
@ -4473,8 +4479,9 @@ $(document).keydown((event) => {
if (testActive) {
let testNow = performance.now();
let testSeconds = Misc.roundTo2((testNow - testStart) / 1000);
let afkseconds = keypressPerSecond.filter((x) => x.count == 0)
.length;
let afkseconds = keypressPerSecond.filter(
(x) => x.count == 0 && x.mod == 0
).length;
incompleteTestSeconds += testSeconds - afkseconds;
restartCount++;
}
@ -4640,8 +4647,9 @@ $(document).keydown((event) => {
showResult(true);
let testNow = performance.now();
let testSeconds = Misc.roundTo2((testNow - testStart) / 1000);
let afkseconds = keypressPerSecond.filter((x) => x.count == 0)
.length;
let afkseconds = keypressPerSecond.filter(
(x) => x.count == 0 && x.mod == 0
).length;
incompleteTestSeconds += testSeconds - afkseconds;
restartCount++;
return;
@ -4661,7 +4669,9 @@ $(document).keydown((event) => {
showResult(true);
let testNow = performance.now();
let testSeconds = Misc.roundTo2((testNow - testStart) / 1000);
let afkseconds = keypressPerSecond.filter((x) => x.count == 0).length;
let afkseconds = keypressPerSecond.filter(
(x) => x.count == 0 && x.mod == 0
).length;
incompleteTestSeconds += testSeconds - afkseconds;
restartCount++;
return;
@ -4829,8 +4839,10 @@ $(document).keydown(function (event) {
"Unidentified",
undefined,
].includes(event.key)
)
) {
currentKeypress.mod++;
return;
}
if (event.key === " ") {
if (config.difficulty !== "normal" || config.strictSpace) {
if (dontInsertSpace) {
@ -4942,7 +4954,9 @@ $(document).keydown(function (event) {
showResult(true);
let testNow = performance.now();
let testSeconds = Misc.roundTo2((testNow - testStart) / 1000);
let afkseconds = keypressPerSecond.filter((x) => x.count == 0).length;
let afkseconds = keypressPerSecond.filter(
(x) => x.count == 0 && x.mod == 0
).length;
incompleteTestSeconds += testSeconds - afkseconds;
restartCount++;
return;