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

Fixes a bug where caps lock was not overridden in caps lock backspace mode.

Browse source
This commit is contained in:
typer 2020-09-09 04:36:43 -07:00
parent 955ac06487
commit ff3c5fd137
2 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
public/js/script.js
View file

@ -563,14 +563,34 @@ function setToggleSettings(state) {
}
function emulateLayout(event) {
function shouldShiftKey(event, newKeyPreview) {
function emulatedLayoutShouldShiftKey(event, newKeyPreview) {
if (config.capsLockBackspace) return event.shiftKey;
const isCapsLockHeld = event.originalEvent.getModifierState("CapsLock");
if (isCapsLockHeld) return isASCIILetter(newKeyPreview) !== event.shiftKey;
return event.shiftKey;
}
if (config.layout === "default" || event.key === " " || event.key === "Enter")
function replaceEventKey(event, keyCode) {
const newKey = String.fromCharCode(keyCode);
event.keyCode = keyCode;
event.charCode = keyCode;
event.which = keyCode;
event.key = newKey;
event.code = "Key" + newKey.toUpperCase();
}
if (event.key === " " || event.key === "Enter")
return event;
if (config.layout === "default") {
//override the shift modifier for the default layout if needed
if (config.capsLockBackspace && isASCIILetter(event.key)) {
replaceEventKey(
event,
event.shiftKey
? event.key.toUpperCase().charCodeAt(0)
: event.key.toLowerCase().charCodeAt(0)
);
}
return event;
}
const qwertyMasterLayout = {
Backquote: "`~",
Digit1: "1!",
@ -621,27 +641,22 @@ function emulateLayout(event) {
Slash: "/?",
Space: " ",
};
let layoutMap = layouts[config.layout];
let qwertyMap = layouts["qwerty"];
const layoutMap = layouts[config.layout];
const qwertyMap = layouts["qwerty"];
let qwertyKey = qwertyMasterLayout[event.code];
const qwertyKey = qwertyMasterLayout[event.code];
let mapIndex;
let newKey;
for (let i = 0; i < qwertyMap.length; i++) {
const key = qwertyMap[i];
let keyIndex = key.indexOf(qwertyKey);
const keyIndex = key.indexOf(qwertyKey);
if (keyIndex != -1) {
mapIndex = i;
}
}
const newKeyPreview = layoutMap[mapIndex][0];
const shift = shouldShiftKey(event, newKeyPreview) ? 1 : 0;
newKey = layoutMap[mapIndex][shift];
event.keyCode = newKey.charCodeAt(0);
event.charCode = newKey.charCodeAt(0);
event.which = newKey.charCodeAt(0);
event.key = newKey;
event.code = "Key" + newKey.toUpperCase();
const shift = emulatedLayoutShouldShiftKey(event, newKeyPreview) ? 1 : 0;
const newKey = layoutMap[mapIndex][shift];
replaceEventKey(event, newKey.charCodeAt(0));
return event;
}

2
public/js/userconfig.js
View file

@ -873,7 +873,7 @@ function changeLanguage(language, nosave) {
}
function setCapsLockBackspace(capsLockBackspace, nosave) {
if (capsLockBackspace == null || capsLockBackspace == undefined) {
if (capsLockBackspace === null || capsLockBackspace === undefined) {
capsLockBackspace = false;
}
config.capsLockBackspace = capsLockBackspace;