X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=96d67049b64034178643e035ae0319d552a23158;hb=57078452549f252460d45e91b84c7eea40dd3e9c;hp=6f7b4dce56c11c14ab14af828c12f840cacb8af1;hpb=feaf1bf73fa8c6054e353585dee0b8a4fdcfbc4e;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 6f7b4dce..96d67049 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -19,44 +19,48 @@ div
     // NOTE: variants pages already have a "Rules" link on top
     span#rulesBtn(
       v-if="!$route.path.match('/variants/')"
-      @click="$emit('showrules')"
+      @click="clickRulesBtn()"
+      :class="btnRulesClass"
     )
       | {{ st.tr["Rules"] }}
-    button.tooltip(
+    button(
+      :class="btnTooltipClass()"
       onClick="window.doClick('modalAdjust')"
       :aria-label="st.tr['Resize board']"
     )
       img.inline(src="/images/icons/resize.svg")
+    button#analyzeBtn(
+      v-if="canAnalyze"
+      :class="btnTooltipClass()"
+      @click="$emit('analyze')"
+      :aria-label="st.tr['Analyse']"
+    )
+      img.inline(src="/images/icons/analyse.svg")
     #downloadDiv(v-if="canDownload")
       a#download(href="#")
-      button.tooltip(
+      button(
+        :class="btnTooltipClass()"
         @click="$emit('download')"
         :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)")
+  .moves-list
     .tr(v-for="moveIdx in evenNumbers")
-      .td {{ firstNum + moveIdx / 2 + 1 }}
-      .td(v-if="moveIdx < moves.length-1 || show == 'all'"
+      .td {{ firstNum + moveIdx / 2 }}
+      .td(
         :class="{'highlight-lm': cursor == moveIdx}"
         @click="() => gotoMove(moveIdx)"
       )
-        | {{ notation(moves[moveIdx]) }}
+        | {{ notation(moveIdx) }}
       .td(
         v-if="moveIdx < moves.length-1"
         :class="{'highlight-lm': cursor == moveIdx+1}"
         @click="() => gotoMove(moveIdx+1)"
       )
-        | {{ notation(moves[moveIdx+1]) }}
+        | {{ notation(moveIdx + 1) }}
 </template>
 
 <script>
@@ -67,16 +71,15 @@ export default {
   name: "my-move-list",
   props: [
     "moves", "show", "canAnalyze", "canDownload",
-    "cursor", "score", "message", "firstNum"],
+    "vname", "cursor", "score", "message", "firstNum"],
   data: function() {
     return {
       st: store.state
     };
   },
   mounted: function() {
-    document.getElementById("adjuster").addEventListener(
-      "click",
-      processModalClick);
+    document.getElementById("adjuster")
+      .addEventListener("click", processModalClick);
     // Take full width on small screens:
     let boardSize = parseInt(localStorage.getItem("boardSize"));
     if (!boardSize) {
@@ -91,17 +94,10 @@ export default {
     gameContainer.style.width = boardSize + movesWidth + "px";
     document.getElementById("boardSize").value =
       (boardSize * 100) / (window.innerWidth - movesWidth);
-    // timeout to avoid calling too many time the adjust method
-    let timeoutLaunched = false;
-    window.addEventListener("resize", () => {
-      if (!timeoutLaunched) {
-        timeoutLaunched = true;
-        setTimeout(() => {
-          this.adjustBoard();
-          timeoutLaunched = false;
-        }, 500);
-      }
-    });
+    window.addEventListener("resize", this.adjustBoard);
+  },
+  beforeDestroy: function() {
+    window.removeEventListener("resize", this.adjustBoard);
   },
   watch: {
     cursor: function(newCursor) {
@@ -109,7 +105,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"
@@ -121,14 +122,42 @@ export default {
   computed: {
     evenNumbers: function() {
       return [...Array(this.moves.length).keys()].filter(i => i%2==0);
+    },
+    btnRulesClass: function() {
+      // "rr" for "rules read"
+      return { highlightRules: !localStorage.getItem("rr_" + this.vname) };
     }
   },
   methods: {
-    notation: function(move) {
+    notation: function(moveIdx) {
+      const move = this.moves[moveIdx];
+      if (this.score != "*") return getFullNotation(move);
+      if (
+        ['none','highlight'].includes(this.show) ||
+        (
+          this.show == "byrow" &&
+          moveIdx == this.moves.length-1 &&
+          moveIdx % 2 == 0
+        )
+      ) {
+        return "?";
+      }
       return getFullNotation(move);
     },
+    btnTooltipClass: function() {
+      return { tooltip: !("ontouchstart" in window) };
+    },
+    clickRulesBtn: function() {
+      const key = "rr_" + this.vname;
+      if (!localStorage.getItem(key)) {
+        localStorage.setItem(key, '1');
+        document.getElementById("rulesBtn").classList.remove("highlightRules");
+      }
+      this.$emit("showrules");
+    },
     gotoMove: function(index) {
-      this.$emit("goto-move", index);
+      // Goto move except if click on current move:
+      if (this.cursor != index) this.$emit("goto-move", index);
     },
     adjustBoard: function() {
       const boardContainer = document.getElementById("boardContainer");
@@ -144,6 +173,7 @@ export default {
       boardContainer.style.width = boardSize + "px";
       document.getElementById("gameContainer").style.width =
         boardSize + movesWidth + "px";
+      this.$emit("redraw-board");
     }
   }
 };
@@ -151,6 +181,7 @@ export default {
 
 <style lang="sass" scoped>
 .moves-list
+  user-select: none
   cursor: pointer
   min-height: 1px
   max-height: 500px
@@ -176,6 +207,10 @@ export default {
 .td.highlight-lm
   background-color: plum
 
+.highlightRules
+  padding: 3px 5px
+  background-color: yellow
+
 #boardSizeBtnContainer
   width: 100%
   text-align: center
@@ -184,10 +219,15 @@ export default {
   padding: 5px
 
 img.inline
-  height: 24px
+  height: 22px
   @media screen and (max-width: 767px)
     height: 18px
 
+#scoreInfo
+  margin: 10px 0
+  @media screen and (max-width: 767px)
+    margin: 5px 0
+
 span.score
   display: inline-block
   margin-left: 10px
@@ -210,4 +250,9 @@ span#rulesBtn
 
 button
   margin: 0
+  &.active
+    background-color: #48C9B0
+
+#aboveMoves button
+  padding-bottom: 5px
 </style>