X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBoard.vue;h=8d429a34014951c428bd9ef92481443e5ef844e5;hb=83c6c2c96e7d34c79db20827f56b51040ef39392;hp=25da6f1444c1e61ecfe84bad3fb8932bbe9b6c2c;hpb=cf94b843f223b34fd2f3680112a183f6d5cd409c;p=vchess.git

diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue
index 25da6f14..8d429a34 100644
--- a/client/src/components/Board.vue
+++ b/client/src/components/Board.vue
@@ -1,22 +1,21 @@
 <script>
 import { getSquareId, getSquareFromId } from "@/utils/squareId";
 import { ArrayFun } from "@/utils/array";
-
+import { store } from "@/store";
 export default {
   name: 'my-board',
   // Last move cannot be guessed from here, and is required to highlight squares
   // vr: object to check moves, print board...
   // userColor is left undefined for an external observer
-  props: ["vr","lastMove","analyze","orientation","userColor","vname"],
+  props: ["vr","lastMove","analyze","incheck","orientation","userColor","vname"],
   data: function () {
     return {
-      hints: (!localStorage["hints"] ? true : localStorage["hints"] === "1"),
-      bcolor: localStorage["bcolor"] || "lichess", //lichess, chesscom or chesstempo
       possibleMoves: [], //filled after each valid click/dragstart
       choices: [], //promotion pieces, or checkered captures... (as moves)
       selectedPiece: null, //moving piece (or clicked piece)
-      incheck: [],
       start: {}, //pixels coordinates + id of starting square (click or drag)
+      currentSquare: null,
+      settings: store.state.settings,
     };
   },
   render(h) {
@@ -42,6 +41,9 @@ export default {
     const squareWidth = (!!boardElt
       ? boardElt.offsetWidth / sizeY
       : 40); //arbitrary value (not relevant)
+    const offset = (!!boardElt
+      ? [boardElt.offsetTop, boardElt.offsetLeft]
+      : [0, 0]);
     const choices = h(
       'div',
       {
@@ -49,7 +51,8 @@ export default {
         'class': { 'row': true },
         style: {
           "display": (this.choices.length > 0 ? "block" : "none"),
-          "top": ((sizeY/2)*squareWidth+squareWidth/2) + "px",
+          "top": (offset[0] + (sizeY/2)*squareWidth-squareWidth/2) + "px",
+          "left": (offset[1] + squareWidth*(sizeY - this.choices.length)/2) + "px",
           "width": (this.choices.length * squareWidth) + "px",
           "height": squareWidth + "px",
         },
@@ -83,7 +86,7 @@ export default {
     );
     // Create board element (+ reserves if needed by variant or mode)
     const lm = this.lastMove;
-    const showLight = this.hints && this.vname != "Dark";
+    const showLight = this.settings.highlight && this.vname != "Dark";
     const gameDiv = h(
       'div',
       {
@@ -126,7 +129,7 @@ export default {
                 )
               );
             }
-            if (this.hints && hintSquares[ci][cj])
+            if (this.settings.hints && hintSquares[ci][cj])
             {
               elems.push(
                 h(
@@ -150,7 +153,7 @@ export default {
                   ['board'+sizeY]: true,
                   'light-square': (i+j)%2==0,
                   'dark-square': (i+j)%2==1,
-                  [this.bcolor]: true,
+                  [this.settings.bcolor]: true,
                   'in-shadow': this.vname=="Dark" && !this.analyze
                     && (!this.userColor
                       || !this.vr.enlightened[this.userColor][ci][cj]),
@@ -279,26 +282,30 @@ export default {
       e.preventDefault(); //disable native drag & drop
       if (!this.selectedPiece && e.target.classList.contains("piece"))
       {
+        let parent = e.target.parentNode;
+        // Mark selected square
+        this.currentSquare = parent;
+        this.currentSquare.classList.add("selected");
         // Next few lines to center the piece on mouse cursor
-        let rect = e.target.parentNode.getBoundingClientRect();
+        let rect = parent.getBoundingClientRect();
         this.start = {
           x: rect.x + rect.width/2,
           y: rect.y + rect.width/2,
-          id: e.target.parentNode.id
+          id: parent.id
         };
         this.selectedPiece = e.target.cloneNode();
         this.selectedPiece.style.position = "absolute";
         this.selectedPiece.style.top = 0;
         this.selectedPiece.style.display = "inline-block";
         this.selectedPiece.style.zIndex = 3000;
-        const startSquare = getSquareFromId(e.target.parentNode.id);
+        const startSquare = getSquareFromId(parent.id);
         this.possibleMoves = [];
         const color = (this.analyze ? this.vr.turn : this.userColor);
         if (this.vr.canIplay(color,startSquare))
           this.possibleMoves = this.vr.getPossibleMovesFrom(startSquare);
         // Next line add moving piece just after current image
         // (required for Crazyhouse reserve)
-        e.target.parentNode.insertBefore(this.selectedPiece, e.target.nextSibling);
+        parent.insertBefore(this.selectedPiece, e.target.nextSibling);
       }
     },
     mousemove: function(e) {
@@ -308,6 +315,12 @@ export default {
       // If there is an active element, move it around
       if (!!this.selectedPiece)
       {
+        // Mousemove => drag & drop, no need to keep initial square highlighted
+        if (!!this.currentSquare)
+        {
+          this.currentSquare.classList.remove("selected");
+          this.currentSquare = null;
+        }
         const [offsetX,offsetY] = !!e.clientX
           ? [e.clientX,e.clientY] //desktop browser
           : [e.changedTouches[0].pageX, e.changedTouches[0].pageY]; //smartphone
@@ -319,7 +332,7 @@ export default {
       if (!this.selectedPiece)
         return;
       e = e || window.event;
-      // Read drop target (or parentElement, parentNode... if type == "img")
+      // Read drop target (or iterate parentNode if type == "img")
       this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coords
       const [offsetX,offsetY] = !!e.clientX
         ? [e.clientX,e.clientY]
@@ -334,6 +347,12 @@ export default {
         // A click: selectedPiece and possibleMoves are already filled
         return;
       }
+      // Reset initial square color (if not mousemove: smartphone)
+      if (!!this.currentSquare)
+      {
+        this.currentSquare.classList.remove("selected");
+        this.currentSquare = null;
+      }
       // OK: process move attempt
       let endSquare = getSquareFromId(landing.id);
       let moves = this.findMatchingMoves(endSquare);
@@ -363,7 +382,7 @@ export default {
 };
 </script>
 
-<style lang="sass">
+<style lang="sass" scoped>
 .game.reserve-div
   margin-bottom: 18px
 
@@ -400,8 +419,8 @@ div.board11
     cursor: pointer
 
 #choices
-  margin: 0 auto 0 auto
-  position: relative
+  margin: 0
+  position: absolute
   z-index: 300
   overflow-y: inherit
   background-color: rgba(0,0,0,0)
@@ -445,6 +464,9 @@ img.ghost
 .incheck
   background-color: #cc3300 !important
 
+.selected
+  background-color: #f7acf7 !important
+
 .light-square.lichess
   background-color: #f0d9b5;
 .dark-square.lichess