X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=e36c058c866ae4c47037cfa59476b7c9b583f103;hb=737a5dafb39740ebe304b8d0a82df85070def571;hp=da3c0472516bcc7ceede2119c7ff515b8235359f;hpb=1e02d16d2a376f7ef0af3c1ea36948a5f5926034;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index da3c0472..e36c058c 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -19,18 +19,19 @@ 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(
-      :class="btnTooltipClass"
+      :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"
+      :class="btnTooltipClass()"
       @click="$emit('analyze')"
       :aria-label="st.tr['Analyse']"
     )
@@ -38,7 +39,7 @@ div
     #downloadDiv(v-if="canDownload")
       a#download(href="#")
       button(
-        :class="btnTooltipClass"
+        :class="btnTooltipClass()"
         @click="$emit('download')"
         :aria-label="st.tr['Download'] + ' PGN'"
       )
@@ -46,20 +47,18 @@ div
   #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 }}
-      .td(v-if="moveIdx < moves.length-1 || show == 'all'"
+      .td(
         :class="{'highlight-lm': cursor == moveIdx}"
         @click="() => gotoMove(moveIdx)"
-      )
-        | {{ notation(moves[moveIdx]) }}
+        v-html="notation(moveIdx)")
       .td(
         v-if="moveIdx < moves.length-1"
-        :class="{'highlight-lm': highlightBlackmove(moveIdx+1)}"
+        :class="{'highlight-lm': cursor == moveIdx+1}"
         @click="() => gotoMove(moveIdx+1)"
-      )
-        | {{ notation(moves[moveIdx + 1]) }}
+        v-html="notation(moveIdx + 1)")
 </template>
 
 <script>
@@ -70,7 +69,7 @@ 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
@@ -80,7 +79,7 @@ export default {
     document.getElementById("adjuster")
       .addEventListener("click", processModalClick);
     // Take full width on small screens:
-    let boardSize = parseInt(localStorage.getItem("boardSize"));
+    let boardSize = parseInt(localStorage.getItem("boardSize"), 10);
     if (!boardSize) {
       boardSize =
         window.innerWidth >= 768
@@ -93,15 +92,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;
-        this.adjustBoard();
-        setTimeout(() => { timeoutLaunched = false; }, 500);
-      }
-    });
+    window.addEventListener("resize", this.adjustBoard);
+  },
+  beforeDestroy: function() {
+    window.removeEventListener("resize", this.adjustBoard);
   },
   watch: {
     cursor: function(newCursor) {
@@ -126,37 +120,49 @@ export default {
   computed: {
     evenNumbers: function() {
       return [...Array(this.moves.length).keys()].filter(i => i%2==0);
+    },
+    btnRulesClass: function() {
+      // "rr" for "rules read"
+      return {
+        highlightRules:
+          !!this.vname && !localStorage.getItem("rr_" + this.vname)
+      };
     }
   },
   methods: {
-    notation: function(move) {
-      return getFullNotation(move);
-    },
-    highlightBlackmove: function(moveIdx) {
-      return (
-        this.cursor == moveIdx ||
+    notation: function(moveIdx) {
+      const move = this.moves[moveIdx];
+      if (this.score != "*") return getFullNotation(move);
+      if (
+        ['none','highlight'].includes(this.show) ||
         (
-          // 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
+          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");
       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...
@@ -168,6 +174,7 @@ export default {
       boardContainer.style.width = boardSize + "px";
       document.getElementById("gameContainer").style.width =
         boardSize + movesWidth + "px";
+      this.$emit("redraw-board");
     }
   }
 };
@@ -201,6 +208,10 @@ export default {
 .td.highlight-lm
   background-color: plum
 
+.highlightRules
+  padding: 3px 5px
+  background-color: yellow
+
 #boardSizeBtnContainer
   width: 100%
   text-align: center
@@ -241,7 +252,7 @@ span#rulesBtn
 button
   margin: 0
   &.active
-    background-color: #50E99A
+    background-color: #48C9B0
 
 #aboveMoves button
   padding-bottom: 5px