Merge pull request #56 from lonevvolf/master

Real fix for the Change Color button not working on first load (from …
cracrayol · Aug 26, 2024 · a3179d7 · a3179d7
2 parents 7ea1602 + b0c3e71
commit a3179d7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/ts/controller/mainMenuController.ts b/src/ts/controller/mainMenuController.ts
@@ -28,7 +28,6 @@ export const mainMenuController = {
      */
     changeColor() {
         settingsController.changeColorTheme(state.color === Color.Light ? Color.Dark : Color.Light);
-        mainMenuController.index();
     },
 
     /** Return page */

diff --git a/src/ts/controller/settingsController.ts b/src/ts/controller/settingsController.ts
@@ -26,7 +26,6 @@ export const settingsController = {
      */
     changeColorTheme(color: Color): void {
         template.changeColorTheme( color );
-        state.updateColorTheme( color );
     },
 
     /**
@@ -35,7 +34,6 @@ export const settingsController = {
      */
     changeTextSize(textSize: TextSize): void {
         template.changeTextSize( textSize );
-        state.updateTextSize( textSize );
     },
 
     /**

diff --git a/src/ts/routing.ts b/src/ts/routing.ts
@@ -56,8 +56,10 @@ export const routing = {
         }
         routing.redirect(initialHash);
 
-        // Force the initial load
-        routing.onHashChange();
+        // Force the initial load if the hashChange event will not fire automatically
+        if (routing.normalizeHash(location.hash) === initialHash) {
+            routing.onHashChange();
+        }
     },
 
     /**
@@ -118,7 +120,7 @@ export const routing = {
 
         let controller;
 
-        // Notify the previous controler that we leave
+        // Notify the previous controller that we leave
         try {
             if ( routing.lastControllerName ) {
                 controller = routing.getController(routing.lastControllerName);

diff --git a/src/ts/views/mainMenuView.ts b/src/ts/views/mainMenuView.ts
@@ -20,7 +20,7 @@ export const mainMenuView = {
             e.preventDefault();
             routing.redirect("loadGame");
         });
-        $("#menu-color-theme").one("click", (e) => {
+        $("#menu-color-theme").on("click", (e) => {
             e.preventDefault();
             mainMenuController.changeColor();
         });