monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-03-12 15:08:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/stevep99/monkeytype

Browse source
This commit is contained in:
Steve P 2020-10-28 18:06:04 +00:00
commit f997c746a9
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
public/css/style.scss
View file

@ -1518,6 +1518,16 @@ key {
user-select: none;
padding-bottom: 1em;
letter{
border-bottom-style: solid;
border-bottom-width: .05em;
border-bottom-color: transparent;
&.dead{
border-bottom-width: .05em;
border-bottom-color: var(--sub-color);
}
}
/* a little hack for right-to-left languages */
&.rightToLeftTest {
flex-direction: row-reverse;
@ -1540,6 +1550,10 @@ key {
.word {
color: var(--text-color);
& letter.dead{
border-bottom-color: var(--sub-color) !important;
}
& letter.correct {
color: var(--sub-color);
}
@ -1557,6 +1571,11 @@ key {
&.colorfulMode {
.word {
& letter.dead{
border-bottom-color: var(--main-color) !important;
}
& letter.correct {
color: var(--main-color);
}
@ -1584,6 +1603,10 @@ key {
.word {
color: var(--main-color);
& letter.dead{
border-bottom-color: var(--sub-color) !important;
}
& letter.correct {
color: var(--sub-color);
}

13
public/js/script.js
View file

@ -1359,7 +1359,7 @@ function flashPressedKeymapKey(key, correct) {
}
try {
if (correct) {
if (correct || config.blindMode) {
$(key)
.stop(true, true)
.css({
@ -1620,7 +1620,7 @@ function countChars() {
}
function calculateStats() {
let testSeconds = roundTo2((testEnd - testStart) / 1000);
let testSeconds = (testEnd - testStart) / 1000;
// if (config.mode == "words" && config.difficulty == "normal") {
// if (inputHistory.length != wordsList.length) return;
@ -4515,7 +4515,6 @@ $(document).keydown(function (event) {
"Meta",
"Alt",
"AltGraph",
"Dead",
"CapsLock",
"Backspace",
"Enter",
@ -4526,6 +4525,7 @@ $(document).keydown(function (event) {
"ArrowLeft",
"ArrowRight",
"ArrowDown",
"OS",
undefined
].includes(event.key)
) return;
@ -4539,6 +4539,13 @@ $(document).keydown(function (event) {
} else {
if (!testActive) return;
}
if (event.key === "Dead") {
playClickSound();
$(document.querySelector("#words .word.active").querySelectorAll("letter")[currentInput.length]).toggleClass('dead');
return;
}
let thisCharCorrect;
let nextCharInWord = wordsList[currentWordIndex].substring(