From 6e23a1358bf48606780a501a8b26b69750170145 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Wed, 3 Jul 2024 00:49:47 -0700
Subject: [PATCH] Moves assigning event listeners into the js code.

---
 index.html |  12 +++---
 main.js    | 117 ++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 91 insertions(+), 38 deletions(-)

diff --git a/index.html b/index.html
index 154feeb..f61e7b0 100644
--- a/index.html
+++ b/index.html
@@ -29,14 +29,14 @@ td.visible {
   </fieldset>
 
   <section>
-  <button id="btnLeft" onclick="btnLeft_onClick()">Left</button>
-  <button id="btnUp" onclick="btnUp_onClick()">Up</button>
-  <button id="btnDown" onclick="btnDown_onClick()">Down</button>
-  <button id="btnRight" onclick="btnRight_onClick()">Right</button>
+  <button id="btnLeft">Left</button>
+  <button id="btnUp">Up</button>
+  <button id="btnDown">Down</button>
+  <button id="btnRight">Right</button>
   </section>
   <section>
-    <button id="btnStart" onclick="btnStart_onClick();">Start</button>
-    <button id="btnRedraw" onclick="btnRedraw_onClick();">Redraw</button>  
+    <button id="btnStart">Start</button>
+    <button id="btnRedraw">Redraw</button>  
   </section>
   <script src="main.js"></script>
 </body>
diff --git a/main.js b/main.js
index 896ef6e..474737e 100644
--- a/main.js
+++ b/main.js
@@ -1,3 +1,5 @@
+let gameBoard;
+
 const Direction = Object.freeze({
     Up: { name: "up" },
     Right: { name: "right" },
@@ -7,24 +9,89 @@ const Direction = Object.freeze({
     fromName(name) { return this.values.filter(i=>i.name == name)[0] || null; },
 });
 
-let gameBoard;
+const setup = () => {
+    document.addEventListener('keydown', ev => {
+        switch (ev.key) {
+            case 'w':
+            case 'ArrowUp':
+                playMove(gameBoard, Direction.Up);
+                break;
+            case 'a':
+            case 'ArrowLeft':
+                playMove(gameBoard, Direction.Left);
+                break;
+            case 's':
+            case 'ArrowDown':
+                playMove(gameBoard, Direction.Down);
+                break;
+            case 'd':
+            case 'ArrowRight':
+                playMove(gameBoard, Direction.Right);
+                break;
+            default:
+                console.log(ev.key);
+                break;
+        }
+    });
 
-const btnStart_onClick = () => {
-    gameBoard = new GameBoard(new Grid(4, 4));
-    // gameBoard = new GameBoard(
-    //     makeDevGrid([ // can't slide down or left
-    //         [2,1,3,4],
-    //         [3,5,7,9],
-    //         [1,2,1,2],
-    //         [3,4,5,0],
-    //     ])
-    // );
-    gameBoard.addRandomTile();
-    redraw(gameBoard);
+    binding = new Binding(['btnStart', 'btnUp', 'btnRight', 'btnDown', 'btnLeft', 'btnRedraw']);
+    const start = () => {
+        gameBoard = new GameBoard(new Grid(4, 4));
+        // gameBoard = new GameBoard(
+        //     makeDevGrid([ // can't slide down or left
+        //         [2,1,3,4],
+        //         [3,5,7,9],
+        //         [1,2,1,2],
+        //         [3,4,5,0],
+        //     ])
+        // );
+        gameBoard.addRandomTile();
+        redraw(gameBoard);
+    };
+    binding.btnStart.on('click', start);
+
+    binding.btnUp.on('click', () => {
+        playMove(gameBoard, Direction.Up);
+    });
+
+    binding.btnRight.on('click', () => {
+        playMove(gameBoard, Direction.Right);
+    });
+
+    binding.btnDown.on('click', () => {
+        playMove(gameBoard, Direction.Down);
+    });
+
+    binding.btnLeft.on('click', () => {
+        playMove(gameBoard, Direction.Left);
+    });
+
+    binding.btnRedraw.on('click', () => {
+        redraw(gameBoard);
+    });
+
+    start();
 }
 
-const btnRedraw_onClick = () => {
-    redraw(gameBoard);
+class ElementBinding {
+    #element;
+
+    constructor (element) {
+        this.#element = element;
+    }
+    on(event, action) {
+        // TODO(tom): Test multiple bindings.
+        if (this.#element != null) {
+            this.#element.addEventListener(event, action);
+        }
+    }
+}
+class Binding {
+    constructor(elementIds) {
+        elementIds.forEach(i => 
+            this[i] = new ElementBinding(document.getElementById(i))
+        );
+    }
 }
 
 // TODO(tom): This should take GameBoard instead of Grid or be moved into GameBoard.
@@ -38,22 +105,6 @@ const playMove = (gameBoard, direction) => {
     checkForEnd(gameBoard);
 }
 
-const btnUp_onClick = () => {
-    playMove(gameBoard, Direction.Up);
-}
-
-const btnDown_onClick = () => {
-    playMove(gameBoard, Direction.Down);
-}
-
-const btnLeft_onClick = () => {
-    playMove(gameBoard, Direction.Left);
-}
-
-const btnRight_onClick = () => {
-    playMove(gameBoard, Direction.Right);
-}
-
 const redraw = (gameBoard) => {
     const element = document.getElementById('output');
     
@@ -414,4 +465,6 @@ class Settings {
     getVector;
     getLength;
     swap;
-};
\ No newline at end of file
+};
+
+setup();
\ No newline at end of file