X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fchessboard-0.3.0.js;h=26c021704f5b45fc5b85b4f376f0ba981b67403a;hb=a6273fb472bf6815668c3ad6a4ec18317ae5b22d;hp=a846f80db510b42014601505cad962a483169991;hpb=15102005d9e0c8eacac16b2a955cd7bf2e4879a1;p=remoteglot

diff --git a/www/js/chessboard-0.3.0.js b/www/js/chessboard-0.3.0.js
index a846f80..26c0217 100644
--- a/www/js/chessboard-0.3.0.js
+++ b/www/js/chessboard-0.3.0.js
@@ -149,6 +149,7 @@ function objToFen(obj) {
   }
 
   var fen = '';
+  let num_empty = 0;
 
   var currentRow = 8;
   for (var i = 0; i < 8; i++) {
@@ -157,32 +158,30 @@ function objToFen(obj) {
 
       // piece exists
       if (obj.hasOwnProperty(square) === true) {
+        if (num_empty > 0) {
+          fen += num_empty;
+          num_empty = 0;
+        }
         fen += pieceCodeToFen(obj[square]);
       }
 
       // empty space
       else {
-        fen += '1';
+        ++num_empty;
       }
     }
 
     if (i !== 7) {
+      if (num_empty > 0) {
+        fen += num_empty;
+        num_empty = 0;
+      }
       fen += '/';
     }
 
     currentRow--;
   }
 
-  // squeeze the numbers together
-  // haha, I love this solution...
-  fen = fen.replace(/11111111/g, '8');
-  fen = fen.replace(/1111111/g, '7');
-  fen = fen.replace(/111111/g, '6');
-  fen = fen.replace(/11111/g, '5');
-  fen = fen.replace(/1111/g, '4');
-  fen = fen.replace(/111/g, '3');
-  fen = fen.replace(/11/g, '2');
-
   return fen;
 }
 
@@ -603,49 +602,55 @@ function offset(el) {  // From https://youmightnotneedjquery.com/.
   };
 }
 
-function animateSquareToSquare(src, dest, piece, completeFn) {
-  // get information about the source and destination squares
-  var srcSquareEl = document.getElementById(SQUARE_ELS_IDS[src]);
-  var srcSquarePosition = offset(srcSquareEl);
-  var destSquareEl = document.getElementById(SQUARE_ELS_IDS[dest]);
-  var destSquarePosition = offset(destSquareEl);
-
-  // create the animated piece and absolutely position it
-  // over the source square
-  var animatedPieceId = createId();
-  document.body.append(buildPiece(piece, true, animatedPieceId));
-  var animatedPieceEl = document.getElementById(animatedPieceId);
-  animatedPieceEl.style.display = null;
-  animatedPieceEl.style.position = 'absolute';
-  animatedPieceEl.style.top = srcSquarePosition.top + 'px';
-  animatedPieceEl.style.left = srcSquarePosition.left + 'px';
-
-  // remove original piece(s) from source square
-  // TODO: multiple pieces should never really happen, but it will if we are moving
-  // while another animation still isn't done
-  srcSquareEl.querySelectorAll('.' + CSS.piece).forEach((piece) => piece.remove());
-
-  // on complete
-  var complete = function() {
-    // add the "real" piece to the destination square
-    destSquareEl.append(buildPiece(piece));
-
-    // remove the animated piece
-    animatedPieceEl.remove();
-
-    // run complete function
-    if (typeof completeFn === 'function') {
-      completeFn();
-    }
-  };
+function animateSquareToSquare(moved_pieces, completeFn) {
+  let pieces = [];
+  for (const {source, destination, piece} of moved_pieces) {
+    // get information about the source and destination squares
+    let srcSquareEl = document.getElementById(SQUARE_ELS_IDS[source]);
+    let srcSquarePosition = offset(srcSquareEl);
+    let destSquareEl = document.getElementById(SQUARE_ELS_IDS[destination]);
+    let destSquarePosition = offset(destSquareEl);
+
+    // create the animated piece and absolutely position it
+    // over the source square
+    let animatedPieceId = createId();
+    document.body.append(buildPiece(piece, true, animatedPieceId));
+    let animatedPieceEl = document.getElementById(animatedPieceId);
+    animatedPieceEl.style.display = null;
+    animatedPieceEl.style.position = 'absolute';
+    animatedPieceEl.style.top = srcSquarePosition.top + 'px';
+    animatedPieceEl.style.left = srcSquarePosition.left + 'px';
+
+    // remove original piece(s) from source square
+    // TODO: multiple pieces should never really happen, but it will if we are moving
+    // while another animation still isn't done
+    srcSquareEl.querySelectorAll('.' + CSS.piece).forEach((piece) => piece.remove());
+
+    // on complete
+    let complete = function() {
+      // add the "real" piece to the destination square
+      destSquareEl.append(buildPiece(piece));
+
+      // remove the animated piece
+      animatedPieceEl.remove();
+
+      // run complete function
+      if (typeof completeFn === 'function') {
+        completeFn();
+      }
+    };
 
-  // animate the piece to the destination square
-  animatedPieceEl.addEventListener('transitionend', complete, {once: true});
+    // animate the piece to the destination square
+    animatedPieceEl.addEventListener('transitionend', complete, {once: true});
+    pieces.push([animatedPieceEl, destSquarePosition]);
+  }
   requestAnimationFrame(() => {
-    animatedPieceEl.style.transitionProperty = 'top, left';
-    animatedPieceEl.style.transitionDuration = cfg.moveSpeed + 'ms';
-    animatedPieceEl.style.top = destSquarePosition.top + 'px';
-    animatedPieceEl.style.left = destSquarePosition.left + 'px';
+    for (let [animatedPieceEl, destSquarePosition] of pieces) {
+      animatedPieceEl.style.transitionProperty = 'top, left';
+      animatedPieceEl.style.transitionDuration = cfg.moveSpeed + 'ms';
+      animatedPieceEl.style.top = destSquarePosition.top + 'px';
+      animatedPieceEl.style.left = destSquarePosition.left + 'px';
+    }
   });
 }
 
@@ -704,6 +709,7 @@ function doAnimations(a, oldPos, newPos) {
   requestAnimationFrame(() => {  // Firefox workaround.
     let fadeout_pieces = [];
     let fadein_pieces = [];
+    let moved_pieces = [];
 
     for (var i = 0; i < a.length; i++) {
       // clear a piece
@@ -723,8 +729,7 @@ function doAnimations(a, oldPos, newPos) {
 
       // move a piece
       if (a[i].type === 'move') {
-        animateSquareToSquare(a[i].source, a[i].destination, a[i].piece,
-          onFinish);
+        moved_pieces.push(a[i]);
       }
     }
 
@@ -736,6 +741,9 @@ function doAnimations(a, oldPos, newPos) {
     if (fadein_pieces.length > 0) {
       fadeIn(fadein_pieces, onFinish);
     }
+    if (moved_pieces.length > 0) {
+      animateSquareToSquare(moved_pieces, onFinish);
+    }
   });
 }