Skip to content

[pull] master from monkeytypegame:master #735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 18, 2025
Merged

[pull] master from monkeytypegame:master #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6a6dad
refactor: replace jQuery with DOM utils in caps lock warning (@Moushu…
MoushufAlam Dec 18, 2025
9e93af4
refactor: replace jQuery with DOM utils for alt and shift key tracker…
MoushufAlam Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/ts/test/alt-tracker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
export let leftState = false;
export let rightState = false;

$(document).on("keydown", (e) => {
document.addEventListener("keydown", (e: KeyboardEvent) => {
if (e.code === "AltLeft") {
leftState = true;
} else if (e.code === "AltRight") {
rightState = true;
}
});

$(document).on("keyup", (e) => {
document.addEventListener("keyup", (e: KeyboardEvent) => {
if (e.code === "AltLeft") {
leftState = false;
} else if (e.code === "AltRight") {
Expand Down
17 changes: 9 additions & 8 deletions frontend/src/ts/test/caps-warning.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
import Config from "../config";
import * as Misc from "../utils/misc";
import { qsr } from "../utils/dom";

const el = document.querySelector("#capsWarning") as HTMLElement;
const el = qsr("#capsWarning");

export let capsState = false;

let visible = false;

function show(): void {
if (!visible) {
el?.classList.remove("hidden");
el.removeClass("hidden");
visible = true;
}
}

function hide(): void {
if (visible) {
el?.classList.add("hidden");
el.addClass("hidden");
visible = false;
}
}

function update(event: JQuery.KeyDownEvent | JQuery.KeyUpEvent): void {
if (event?.originalEvent?.key === "CapsLock" && capsState !== null) {
function update(event: KeyboardEvent): void {
if (event.key === "CapsLock" && capsState !== null) {
capsState = !capsState;
} else {
const modState = event?.originalEvent?.getModifierState?.("CapsLock");
const modState = event.getModifierState?.("CapsLock");
if (modState !== undefined) {
capsState = modState;
}
Expand All @@ -40,8 +41,8 @@ function update(event: JQuery.KeyDownEvent | JQuery.KeyUpEvent): void {
} catch {}
}

$(document).on("keyup", update);
document.addEventListener("keyup", update);

$(document).on("keydown", (event) => {
document.addEventListener("keydown", (event) => {
if (Misc.isMac()) update(event);
});
4 changes: 2 additions & 2 deletions frontend/src/ts/test/shift-tracker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as KeyConverter from "../utils/key-converter";
export let leftState = false;
export let rightState = false;

$(document).on("keydown", (e) => {
document.addEventListener("keydown", (e: KeyboardEvent) => {
if (e.code === "ShiftLeft") {
leftState = true;
rightState = false;
Expand All @@ -14,7 +14,7 @@ $(document).on("keydown", (e) => {
}
});

$(document).on("keyup", (e) => {
document.addEventListener("keyup", (e: KeyboardEvent) => {
if (e.code === "ShiftLeft" || e.code === "ShiftRight") {
leftState = false;
rightState = false;
Expand Down
Loading