Decompose click handler

cutiful · Mar 28, 2020 · d3d9cbf · d3d9cbf
1 parent 06fa2a8
commit d3d9cbf
Showing 1 changed file with 25 additions and 17 deletions.
diff --git a/src/game.js b/src/game.js
@@ -81,29 +81,21 @@ class FourInLine {
       drawText(this.ctx, this.width, this.height, "No moves left!", 32, "white", "black");
   }
 
-  _clickHandler(e) {
-    if (this.paused) return;
-
-    if (this._noMoves || this._winner.team) {
-      this.reset.call(this);
-      this._active = true;
-      this._currentTurn = this._firstTurn === 1 ? 2 : 1;
-      this._firstTurn = this._currentTurn;
-      this.draw.call(this);
-      return;
-    }
-
-    if (!this._active) return;
-
-    const col = this._selectedColumn - 1;
+  static getMoveRow(circles, col) {
     let row = -1;
-    for (let i = this._circles.length - 1; i >= 0; i--) {
-      if (this._circles[i][col]) continue;
+    for (let i = circles.length - 1; i >= 0; i--) {
+      if (circles[i][col]) continue;
 
       row = i;
       break;
     }
 
+    return row;
+  }
+
+  processMove(col) {
+    const row = FourInLine.getMoveRow(this._circles, col);
+
     if (row === -1) return;
     this._active = false;
     this.animating = true;
@@ -124,6 +116,22 @@ class FourInLine {
     });
   }
 
+  _clickHandler(e) {
+    if (this.paused) return;
+
+    if (this._noMoves || this._winner.team) {
+      this.reset.call(this);
+      this._active = true;
+      this._currentTurn = this._firstTurn === 1 ? 2 : 1;
+      this._firstTurn = this._currentTurn;
+      this.draw.call(this);
+      return;
+    }
+
+    if (!this._active) return;
+    this.processMove.call(this, this._selectedColumn - 1);
+  }
+
   _mousemoveHandler(e) {
     const column = Math.ceil(e.offsetX / (this.width / columns));
     if (column !== this._selectedColumn) {