X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=6e9e850f4b0fa18729ce43fa699282d6e24114a2;hb=5fc82c80fe57ad106cc117a534b242cc08805890;hp=228971a9bd6d16bfea77a460aca36e76d75375e2;hpb=0cc44e583fd266eab65f1c9cb0fd79d07d99d319;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 228971a9..6e9e850f 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -27,6 +27,12 @@ div
       :aria-label="st.tr['Resize board']"
     )
       img.inline(src="/images/icons/resize.svg")
+    button#analyzeBtn.tooltip(
+      v-show="canAnalyze"
+      @click="$emit('analyze')"
+      :aria-label="st.tr['Analyse']"
+    )
+      img.inline(src="/images/icons/analyse.svg")
     #downloadDiv(v-if="canDownload")
       a#download(href="#")
       button.tooltip(
@@ -34,18 +40,12 @@ div
         :aria-label="st.tr['Download'] + ' PGN'"
       )
         img.inline(src="/images/icons/download.svg")
-    button.tooltip(
-      v-if="canAnalyze"
-      @click="$emit('analyze')"
-      :aria-label="st.tr['Analyse']"
-    )
-      img.inline(src="/images/icons/analyse.svg")
   #scoreInfo(v-if="score!='*'")
     span.score {{ score }}
     span.score-msg {{ st.tr[message] }}
   .moves-list(v-if="!['none','highlight'].includes(show)")
     .tr(v-for="moveIdx in evenNumbers")
-      .td {{ firstNum + moveIdx / 2 + 1 }}
+      .td {{ firstNum + moveIdx / 2 }}
       .td(v-if="moveIdx < moves.length-1 || show == 'all'"
         :class="{'highlight-lm': cursor == moveIdx}"
         @click="() => gotoMove(moveIdx)"
@@ -53,10 +53,10 @@ div
         | {{ notation(moves[moveIdx]) }}
       .td(
         v-if="moveIdx < moves.length-1"
-        :class="{'highlight-lm': cursor == moveIdx+1}"
+        :class="{'highlight-lm': highlightBlackmove(moveIdx+1)}"
         @click="() => gotoMove(moveIdx+1)"
       )
-        | {{ notation(moves[moveIdx+1]) }}
+        | {{ notation(moves[moveIdx + 1]) }}
 </template>
 
 <script>
@@ -74,9 +74,14 @@ export default {
     };
   },
   mounted: function() {
-    document.getElementById("adjuster").addEventListener(
-      "click",
-      processModalClick);
+    document.getElementById("adjuster")
+      .addEventListener("click", processModalClick);
+    if ("ontouchstart" in window) {
+      // Disable tooltips on smartphones:
+      document.querySelectorAll("#aboveMoves .tooltip").forEach(elt => {
+        elt.classList.remove("tooltip");
+      });
+    }
     // Take full width on small screens:
     let boardSize = parseInt(localStorage.getItem("boardSize"));
     if (!boardSize) {
@@ -96,10 +101,8 @@ export default {
     window.addEventListener("resize", () => {
       if (!timeoutLaunched) {
         timeoutLaunched = true;
-        setTimeout(() => {
-          this.adjustBoard();
-          timeoutLaunched = false;
-        }, 500);
+        this.adjustBoard();
+        setTimeout(() => { timeoutLaunched = false; }, 500);
       }
     });
   },
@@ -109,7 +112,12 @@ export default {
       // $nextTick to wait for table > tr to be rendered
       this.$nextTick(() => {
         let curMove = document.querySelector(".td.highlight-lm");
-        if (curMove) {
+        if (!curMove && this.moves.length > 0) {
+          // Cursor is before game beginning, and some moves were made:
+          curMove =
+            document.querySelector(".moves-list > .tr:first-child > .td");
+        }
+        if (!!curMove) {
           curMove.scrollIntoView({
             behavior: "auto",
             block: "nearest"
@@ -127,12 +135,28 @@ export default {
     notation: function(move) {
       return getFullNotation(move);
     },
+    highlightBlackmove: function(moveIdx) {
+      return (
+        this.cursor == moveIdx ||
+        (
+          // If display by rows, hightlight last black move while the white
+          // move is being played:
+          this.show == "byrow" &&
+          this.cursor == moveIdx + 1 &&
+          // ...except if cursor is behind in the game:
+          this.cursor == this.moves.length - 1
+        )
+      );
+    },
     gotoMove: function(index) {
       this.$emit("goto-move", index);
     },
     adjustBoard: function() {
       const boardContainer = document.getElementById("boardContainer");
       if (!boardContainer) return; //no board on page
+      let arrows = document.getElementById("arrowCanvas");
+      // TODO: arrows on board don't scale
+      if (!!arrows) this.$emit("reset-arrows");
       const k = document.getElementById("boardSize").value;
       const movesWidth = window.innerWidth >= 768 ? 280 : 0;
       const minBoardWidth = 240; //TODO: these 240 and 280 are arbitrary...
@@ -151,6 +175,7 @@ export default {
 
 <style lang="sass" scoped>
 .moves-list
+  user-select: none
   cursor: pointer
   min-height: 1px
   max-height: 500px
@@ -184,7 +209,7 @@ export default {
   padding: 5px
 
 img.inline
-  height: 24px
+  height: 22px
   @media screen and (max-width: 767px)
     height: 18px
 
@@ -215,4 +240,9 @@ span#rulesBtn
 
 button
   margin: 0
+  &.active
+    background-color: #50E99A
+
+#aboveMoves button
+  padding-bottom: 5px
 </style>