From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Apr 2021 00:24:38 +0000 (+0100)
Subject: js: Fold api call into do_ungrab (renaming that function)
X-Git-Tag: otter-0.5.0~199
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d432b532cd6288aea93f32fb86839d0e90e9d455;p=otter.git

js: Fold api call into do_ungrab (renaming that function)

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

diff --git a/templates/script.ts b/templates/script.ts
index 9b2921a6..4a4c5f76 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -959,8 +959,7 @@ function ungrab_all() {
   for (let tpiece of Object.keys(pieces)) {
     let tp = pieces[tpiece]!;
     if (tp.held == us) {
-      set_ungrab(tpiece,tp);
-      api_piece(api, 'ungrab', tpiece,tp, { });
+      do_ungrab(tpiece,tp);
     }
   }
 }
@@ -971,11 +970,12 @@ function set_grab(piece: PieceId, p: PieceInfo, owner: PlayerId) {
   redisplay_ancillaries(piece,p);
   recompute_keybindings();
 }
-function set_ungrab(piece: PieceId, p: PieceInfo) {
+function do_ungrab(piece: PieceId, p: PieceInfo) {
   p.held = null;
   p.drag_delta = 0;
   redisplay_ancillaries(piece,p);
   recompute_keybindings();
+  api_piece(api, 'ungrab', piece,p, { });
 }
 
 function clear_halo(piece: PieceId, p: PieceInfo) {
@@ -1114,8 +1114,7 @@ function drag_end() {
     for (let dp of drag_pieces) {
       let piece = dp.piece;
       let p = pieces[piece]!;
-      set_ungrab(piece,p);
-      api_piece(api, 'ungrab', piece,p, { });
+      do_ungrab(piece,p);
     }
   }
   drag_cancel();