X-Git-Url: https://git.auder.net/assets/current/git-logo.png?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBoard.vue;h=b7b7f11053558ba68f36d79f3e060f43f45a5837;hb=945a61650f0e496e1bea84d0b06657cf45cf7edf;hp=8d429a34014951c428bd9ef92481443e5ef844e5;hpb=83c6c2c96e7d34c79db20827f56b51040ef39392;p=vchess.git

diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue
index 8d429a34..b7b7f110 100644
--- a/client/src/components/Board.vue
+++ b/client/src/components/Board.vue
@@ -14,7 +14,6 @@ export default {
       choices: [], //promotion pieces, or checkered captures... (as moves)
       selectedPiece: null, //moving piece (or clicked piece)
       start: {}, //pixels coordinates + id of starting square (click or drag)
-      currentSquare: null,
       settings: store.state.settings,
     };
   },
@@ -44,46 +43,6 @@ export default {
     const offset = (!!boardElt
       ? [boardElt.offsetTop, boardElt.offsetLeft]
       : [0, 0]);
-    const choices = h(
-      'div',
-      {
-        attrs: { "id": "choices" },
-        'class': { 'row': true },
-        style: {
-          "display": (this.choices.length > 0 ? "block" : "none"),
-          "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",
-        },
-      },
-      this.choices.map(m => { //a "choice" is a move
-        return h('div',
-          {
-            'class': {
-              'board': true,
-              ['board'+sizeY]: true,
-            },
-            style: {
-              'width': (100/this.choices.length) + "%",
-              'padding-bottom': (100/this.choices.length) + "%",
-            },
-          },
-          [h('img',
-            {
-              attrs: { "src": '/images/pieces/' +
-                V.getPpath(m.appear[0].c+m.appear[0].p) + '.svg' },
-              'class': { 'choice-piece': true },
-              on: {
-                "click": e => { this.play(m); this.choices=[]; },
-                // NOTE: add 'touchstart' event to fix a problem on smartphones
-                "touchstart": e => { this.play(m); this.choices=[]; },
-              },
-            })
-          ]
-        );
-      })
-    );
     // Create board element (+ reserves if needed by variant or mode)
     const lm = this.lastMove;
     const showLight = this.settings.highlight && this.vname != "Dark";
@@ -171,7 +130,48 @@ export default {
       })
     );
     const playingColor = this.userColor || "w"; //default for an observer
-    let elementArray = [choices, gameDiv];
+    let elementArray = [gameDiv];
+    if (this.choices.length > 0)
+    {
+      const choices = h(
+        'div',
+        {
+          attrs: { "id": "choices" },
+          'class': { 'row': true },
+          style: {
+            "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",
+          },
+        },
+        this.choices.map(m => { //a "choice" is a move
+          return h('div',
+            {
+              'class': {
+                'board': true,
+                ['board'+sizeY]: true,
+              },
+              style: {
+                'width': (100/this.choices.length) + "%",
+                'padding-bottom': (100/this.choices.length) + "%",
+              },
+            },
+            [h('img',
+              {
+                attrs: { "src": '/images/pieces/' +
+                  V.getPpath(m.appear[0].c+m.appear[0].p) + '.svg' },
+                'class': { 'choice-piece': true },
+                on: {
+                  "click": e => { this.play(m); this.choices=[]; },
+                },
+              })
+            ]
+          );
+        })
+      );
+      elementArray.unshift(choices);
+    }
     if (!!this.vr.reserve)
     {
       const shiftIdx = (playingColor=="w" ? 0 : 1);
@@ -247,19 +247,31 @@ export default {
       );
       elementArray.push(reserves);
     }
-    return h(
-      'div',
-      {
-        // NOTE: click = mousedown + mouseup
+    let onEvents = {};
+    // NOTE: click = mousedown + mouseup
+    if ('ontouchstart' in window)
+    {
+      onEvents = {
         on: {
-          mousedown: this.mousedown,
-          mousemove: this.mousemove,
-          mouseup: this.mouseup,
           touchstart: this.mousedown,
           touchmove: this.mousemove,
           touchend: this.mouseup,
         },
-      },
+      };
+    }
+    else
+    {
+      onEvents = {
+        on: {
+          mousedown: this.mousedown,
+          mousemove: this.mousemove,
+          mouseup: this.mouseup,
+        },
+      };
+    }
+    return h(
+      'div',
+      onEvents,
       elementArray
     );
   },
@@ -283,9 +295,6 @@ export default {
       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 = parent.getBoundingClientRect();
         this.start = {
@@ -294,10 +303,11 @@ export default {
           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;
+        let spStyle = this.selectedPiece.style
+        spStyle.position = "absolute";
+        spStyle.top = 0;
+        spStyle.display = "inline-block";
+        spStyle.zIndex = 3000;
         const startSquare = getSquareFromId(parent.id);
         this.possibleMoves = [];
         const color = (this.analyze ? this.vr.turn : this.userColor);
@@ -315,12 +325,6 @@ 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
@@ -332,7 +336,6 @@ export default {
       if (!this.selectedPiece)
         return;
       e = e || window.event;
-      // 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]
@@ -347,13 +350,7 @@ 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
+      // OK: process move attempt, landing is a square node
       let endSquare = getSquareFromId(landing.id);
       let moves = this.findMatchingMoves(endSquare);
       this.possibleMoves = [];
@@ -394,24 +391,6 @@ export default {
 
 // NOTE: no variants with reserve of size != 8
 
-div.board
-  float: left
-  height: 0
-  display: inline-block
-  position: relative
-
-div.board8
-  width: 12.5%
-  padding-bottom: 12.5%
-
-div.board10
-  width: 10%
-  padding-bottom: 10%
-
-div.board11
-  width: 9.09%
-  padding-bottom: 9.1%
-
 .game
   width: 100%
   margin: 0
@@ -434,22 +413,6 @@ div.board11
       height: auto
       display: block
 
-img.piece
-  width: 100%
-
-img.piece, img.mark-square
-  max-width: 100%
-  height: auto
-  display: block
-
-img.mark-square
-  opacity: 0.6
-  width: 76%
-  position: absolute
-  top: 12%
-  left: 12%
-  opacity: .7
-
 img.ghost
   position: absolute
   opacity: 0.4
@@ -458,15 +421,9 @@ img.ghost
 .highlight
   background-color: #00cc66 !important
 
-.in-shadow
-  filter: brightness(50%)
-
 .incheck
   background-color: #cc3300 !important
 
-.selected
-  background-color: #f7acf7 !important
-
 .light-square.lichess
   background-color: #f0d9b5;
 .dark-square.lichess