X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=ecdc14207f6a432656810c84373b6791f84f26b3;hp=d47a1a4a80ff37c82069b7aa8033983f2bb909ab;hb=be4b9421603ea763010b01b853363a1bda93ce36;hpb=659a9bd22c88177e203207a406cdb6c9f69139d4

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index d47a1a4a..ecdc1420 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -19,7 +19,8 @@ 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(
@@ -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,28 +79,19 @@ export default {
     document.getElementById("adjuster")
       .addEventListener("click", processModalClick);
     // Take full width on small screens:
-    let boardSize = parseInt(localStorage.getItem("boardSize"));
-    if (!boardSize) {
-      boardSize =
-        window.innerWidth >= 768
-          ? 0.75 * Math.min(window.innerWidth, window.innerHeight)
-          : window.innerWidth;
-    }
     const movesWidth = window.innerWidth >= 768 ? 280 : 0;
+    const winBound = Math.min(window.innerWidth - movesWidth, window.innerHeight);
+    let boardSize = (window.innerWidth >= 768 ? 0.7 : 1.0) * winBound;
     document.getElementById("boardContainer").style.width = boardSize + "px";
     let gameContainer = document.getElementById("gameContainer");
     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);
-      }
-    });
+    const minBoardWidth =
+      (window.innerWidth <= 767 || "ontouchstart" in window) ? 160 : 240;
+    document.getElementById("boardSize").value = (boardSize - minBoardWidth) * 100 / (winBound - minBoardWidth);
+    window.addEventListener("resize", () => this.adjustBoard());
+  },
+  beforeDestroy: function() {
+    window.removeEventListener("resize", this.adjustBoard);
   },
   watch: {
     cursor: function(newCursor) {
@@ -126,48 +116,78 @@ 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() {
+    adjustBoard: function(vertical) {
       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...
-      // Value of 0 is board min size; 100 is window.width [- movesWidth]
-      const boardSize =
-        minBoardWidth +
-        (k * (window.innerWidth - (movesWidth + minBoardWidth))) / 100;
-      localStorage.setItem("boardSize", boardSize);
-      boardContainer.style.width = boardSize + "px";
-      document.getElementById("gameContainer").style.width =
-        boardSize + movesWidth + "px";
+      let gameContainer = document.getElementById("gameContainer");
+      if (vertical) {
+        const bRect =
+          document.getElementById("rootBoardElement").getBoundingClientRect();
+        if (bRect.bottom > window.innerHeight) {
+          const maxHeight = window.innerHeight - 20;
+          document.getElementById("boardContainer").style.height = maxHeight + "px";
+          const boardSize = maxHeight * bRect.width / bRect.height;
+          boardContainer.style.width = Math.min(boardSize, boardContainer.style.width) + "px";
+          gameContainer.style.width = boardSize + movesWidth + "px";
+          this.$emit("redraw-board");
+          setTimeout( () => window.scroll(0, bRect.top), 1000);
+        }
+      }
+      else {
+        const k = document.getElementById("boardSize").value;
+        // TODO: these 160 and 280 are arbitrary...
+        const minBoardWidth =
+          (window.innerWidth <= 767 || "ontouchstart" in window) ? 160 : 240;
+        // Value of 0 is board min size; 100 is window.width [- movesWidth]
+        const maxWidth =
+          Math.min(window.innerHeight, window.innerWidth - movesWidth);
+        const boardSize =
+          minBoardWidth + (k * (maxWidth - minBoardWidth)) / 100;
+        boardContainer.style.width = boardSize + "px";
+        gameContainer.style.width = boardSize + movesWidth + "px";
+        this.$emit("redraw-board");
+      }
     }
   }
 };
@@ -201,6 +221,10 @@ export default {
 .td.highlight-lm
   background-color: plum
 
+.highlightRules
+  padding: 3px 5px
+  background-color: yellow
+
 #boardSizeBtnContainer
   width: 100%
   text-align: center
@@ -241,7 +265,7 @@ span#rulesBtn
 button
   margin: 0
   &.active
-    background-color: #50E99A
+    background-color: #48C9B0
 
 #aboveMoves button
   padding-bottom: 5px