From bcde5978415f8664dd7a8e389796d0441e5ea622 Mon Sep 17 00:00:00 2001
From: Miodec <jack@monkeytype.com>
Date: Sun, 16 Oct 2022 20:34:06 +0200
Subject: [PATCH] updated event haldners

---
 frontend/src/ts/settings/settings-group.ts |  8 ++---
 frontend/src/ts/settings/theme-picker.ts   | 40 +++++++++-------------
 frontend/src/ts/test/test-logic.ts         | 26 +++++++-------
 frontend/src/ts/test/test-ui.ts            |  4 ---
 4 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/frontend/src/ts/settings/settings-group.ts b/frontend/src/ts/settings/settings-group.ts
index d5f016163..b1a381ae0 100644
--- a/frontend/src/ts/settings/settings-group.ts
+++ b/frontend/src/ts/settings/settings-group.ts
@@ -35,9 +35,9 @@ export default class SettingsGroup {
     this.updateInput();
 
     if (this.mode === "select") {
-      $(document).on(
+      $(".pageSettings").on(
         "change",
-        `.pageSettings .section.${this.configName} select`,
+        `.section.${this.configName} select`,
         (e) => {
           const target = $(e.currentTarget);
           if (
@@ -50,9 +50,9 @@ export default class SettingsGroup {
         }
       );
     } else if (this.mode === "button") {
-      $(document).on(
+      $(".pageSettings").on(
         "click",
-        `.pageSettings .section.${this.configName} .button`,
+        `.section.${this.configName} .button`,
         (e) => {
           const target = $(e.currentTarget);
           if (
diff --git a/frontend/src/ts/settings/theme-picker.ts b/frontend/src/ts/settings/theme-picker.ts
index f9044fa72..ce44ac410 100644
--- a/frontend/src/ts/settings/theme-picker.ts
+++ b/frontend/src/ts/settings/theme-picker.ts
@@ -288,35 +288,27 @@ $(".pageSettings .section.themes .tabs .button").on("click", (e) => {
 });
 
 // Handle click on custom theme button
-$(document).on(
-  "click",
-  ".pageSettings .section.themes .customTheme.button",
-  (e) => {
-    // Do not apply if user wanted to delete it
-    if ($(e.target).hasClass("delButton")) return;
-    if ($(e.target).hasClass("editButton")) return;
-    const customThemeId = $(e.currentTarget).attr("customThemeId") ?? "";
-    ThemeController.set(customThemeId, true);
-  }
-);
+$(".pageSettings").on("click", " .section.themes .customTheme.button", (e) => {
+  // Do not apply if user wanted to delete it
+  if ($(e.target).hasClass("delButton")) return;
+  if ($(e.target).hasClass("editButton")) return;
+  const customThemeId = $(e.currentTarget).attr("customThemeId") ?? "";
+  ThemeController.set(customThemeId, true);
+});
 
 // Handle click on favorite preset theme button
-$(document).on(
-  "click",
-  ".pageSettings .section.themes .theme .favButton",
-  (e) => {
-    const theme = $(e.currentTarget).parents(".theme.button").attr("theme");
-    if (theme !== undefined) toggleFavourite(theme);
-    else {
-      console.error(
-        "Could not find the theme attribute attached to the button clicked!"
-      );
-    }
+$(".pageSettings").on("click", ".section.themes .theme .favButton", (e) => {
+  const theme = $(e.currentTarget).parents(".theme.button").attr("theme");
+  if (theme !== undefined) toggleFavourite(theme);
+  else {
+    console.error(
+      "Could not find the theme attribute attached to the button clicked!"
+    );
   }
-);
+});
 
 // Handle click on preset theme button
-$(document).on("click", ".pageSettings .section.themes .theme.button", (e) => {
+$(".pageSettings").on("click", ".section.themes .theme.button", (e) => {
   const theme = $(e.currentTarget).attr("theme");
   if (!$(e.target).hasClass("favButton") && theme !== undefined) {
     UpdateConfig.setTheme(theme);
diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
index b51ca295d..62b4a16dd 100644
--- a/frontend/src/ts/test/test-logic.ts
+++ b/frontend/src/ts/test/test-logic.ts
@@ -1872,7 +1872,7 @@ export function fail(reason: string): void {
   TestStats.pushIncompleteTest(acc, tt);
 }
 
-$(document).on("click", "#testModesNotice .textButton.restart", () => {
+$(".pageTest").on("click", "#testModesNotice .textButton.restart", () => {
   restart();
 });
 
@@ -1882,7 +1882,7 @@ $(document).on("keypress", "#restartTestButton", (event) => {
   }
 });
 
-$(document.body).on("click", "#restartTestButton", () => {
+$(".pageTest").on("click", "#restartTestButton", () => {
   ManualRestart.set();
   if (TestUI.resultCalculating) return;
   if (
@@ -1898,7 +1898,7 @@ $(document.body).on("click", "#restartTestButton", () => {
   }
 });
 
-$(document.body).on("click", "#retrySavingResultButton", retrySavingResult);
+$(".pageTest").on("click", "#retrySavingResultButton", retrySavingResult);
 
 $(document).on("keypress", "#nextTestButton", (event) => {
   if (event.key === "Enter") {
@@ -1906,12 +1906,12 @@ $(document).on("keypress", "#nextTestButton", (event) => {
   }
 });
 
-$(document.body).on("click", "#nextTestButton", () => {
+$(".pageTest").on("click", "#nextTestButton", () => {
   ManualRestart.set();
   restart();
 });
 
-$(document.body).on("click", "#restartTestButtonWithSameWordset", () => {
+$(".pageTest").on("click", "#restartTestButtonWithSameWordset", () => {
   if (Config.mode == "zen") {
     Notifications.add("Repeat test disabled in zen mode");
     return;
@@ -1934,7 +1934,7 @@ $(document).on("keypress", "#restartTestButtonWithSameWordset", (event) => {
   }
 });
 
-$(document).on("click", "#testConfig .mode .textButton", (e) => {
+$(".pageTest").on("click", "#testConfig .mode .textButton", (e) => {
   if (TestUI.testRestarting) return;
   if ($(e.currentTarget).hasClass("active")) return;
   const mode = ($(e.currentTarget).attr("mode") ?? "time") as MonkeyTypes.Mode;
@@ -1944,7 +1944,7 @@ $(document).on("click", "#testConfig .mode .textButton", (e) => {
   restart();
 });
 
-$(document).on("click", "#testConfig .wordCount .textButton", (e) => {
+$(".pageTest").on("click", "#testConfig .wordCount .textButton", (e) => {
   if (TestUI.testRestarting) return;
   const wrd = $(e.currentTarget).attr("wordCount") ?? "15";
   if (wrd != "custom") {
@@ -1954,7 +1954,7 @@ $(document).on("click", "#testConfig .wordCount .textButton", (e) => {
   }
 });
 
-$(document).on("click", "#testConfig .time .textButton", (e) => {
+$(".pageTest").on("click", "#testConfig .time .textButton", (e) => {
   if (TestUI.testRestarting) return;
   const mode = $(e.currentTarget).attr("timeConfig") ?? "10";
   if (mode != "custom") {
@@ -1964,7 +1964,7 @@ $(document).on("click", "#testConfig .time .textButton", (e) => {
   }
 });
 
-$(document).on("click", "#testConfig .quoteLength .textButton", (e) => {
+$(".pageTest").on("click", "#testConfig .quoteLength .textButton", (e) => {
   if (TestUI.testRestarting) return;
   let len: MonkeyTypes.QuoteLength | MonkeyTypes.QuoteLength[] = <
     MonkeyTypes.QuoteLength
@@ -1979,14 +1979,14 @@ $(document).on("click", "#testConfig .quoteLength .textButton", (e) => {
   }
 });
 
-$(document).on("click", "#testConfig .punctuationMode.textButton", () => {
+$(".pageTest").on("click", "#testConfig .punctuationMode.textButton", () => {
   if (TestUI.testRestarting) return;
   UpdateConfig.setPunctuation(!Config.punctuation);
   ManualRestart.set();
   restart();
 });
 
-$(document).on("click", "#testConfig .numbersMode.textButton", () => {
+$(".pageTest").on("click", "#testConfig .numbersMode.textButton", () => {
   if (TestUI.testRestarting) return;
   UpdateConfig.setNumbers(!Config.numbers);
   ManualRestart.set();
@@ -2017,7 +2017,7 @@ $("#practiseWordsPopup .button.both").on("click", () => {
   });
 });
 
-$(document).on(
+$("#popups").on(
   "click",
   "#quoteSearchPopup #quoteSearchResults .searchResult",
   (e) => {
@@ -2033,7 +2033,7 @@ $(document).on(
   }
 );
 
-$(document).on("click", "#top #menu #startTestButton, #top .logo", () => {
+$("#top").on("click", "#menu #startTestButton, .logo", () => {
   if (ActivePage.get() === "test") restart();
 });
 
diff --git a/frontend/src/ts/test/test-ui.ts b/frontend/src/ts/test/test-ui.ts
index 1fd49e80b..4a2d695f3 100644
--- a/frontend/src/ts/test/test-ui.ts
+++ b/frontend/src/ts/test/test-ui.ts
@@ -979,10 +979,6 @@ $("#saveScreenshotButton").on("keypress", (e) => {
   }
 });
 
-$(document).on("click", "#testModesNotice .textButton.blind", () => {
-  UpdateConfig.setBlindMode(!Config.blindMode);
-});
-
 $(".pageTest #copyWordsListButton").on("click", async () => {
   try {
     let words;