From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 12 Apr 2021 18:18:55 +0000 (+0100)
Subject: js: Break out mouse_clicked_one
X-Git-Tag: otter-0.5.0~104
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=826f8995e0984390f860b4324d00e6d73dd8be1f;p=otter.git

js: Break out mouse_clicked_one

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/templates/script.ts b/templates/script.ts
index 8c0b3273..a1ec969c 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -840,6 +840,13 @@ type MouseFindClicked = null | {
   pinned: boolean
 };
 
+function mouse_clicked_one(piece: PieceId): MouseFindClicked {
+  let p = pieces[piece]!;
+  let held = p.held;
+  let pinned = p.pinned;
+  return { clicked: [piece], held, pinned };
+}
+
 function mouse_find_clicked(e: MouseEvent, target: SVGGraphicsElement,
 			    piece: PieceId): MouseFindClicked
 {
@@ -847,15 +854,8 @@ function mouse_find_clicked(e: MouseEvent, target: SVGGraphicsElement,
   let held;
   let pinned;
 
-  function clicked_one(piece: PieceId): MouseFindClicked {
-    let p = pieces[piece]!;
-    held = p.held;
-    pinned = p.pinned;
-    return { clicked: [piece], held, pinned };
-  }
-
   if (special_count == null) {
-    return clicked_one(piece);
+    return mouse_clicked_one(piece);
   } else if (special_count == 0) {
     let clickpos = mouseevent_pos(e);
     let uelem = pieces_marker;
@@ -865,7 +865,7 @@ function mouse_find_clicked(e: MouseEvent, target: SVGGraphicsElement,
       let piece = uelem.dataset.piece!;
       let p = pieces[piece]!;
       if (p_bbox_contains(p, clickpos)) {
-	return clicked_one(piece);
+	return mouse_clicked_one(piece);
       }
     }
     return null;