X-Git-Url: https://git.auder.net/pieces/Checkered/cq.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=920d5240579692424f421e8f9f15b7f4bf6dc15a;hb=311cba767e3c461edb0c8c758bfb193ef670a68f;hp=29e9a9feb2ccbcdd3002a0f86b1384aa3588d4b5;hpb=6808d7a16ec1e761c6a2dffec2281c96953e4d89;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 29e9a9fe..920d5240 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,26 +1,45 @@
+<template lang="pug">
+div
+  #scoreInfo(v-if="score!='*'")
+    p {{ score }}
+    p {{ st.tr[message] }}
+  .moves-list
+    .tr(v-for="moveIdx in evenNumbers")
+      .td {{ firstNum + moveIdx / 2 + 1 }}
+      .td(v-if="moveIdx < moves.length-1 || show == 'all'"
+        :class="{'highlight-lm': cursor == moveIdx}"
+        @click="() => gotoMove(moveIdx)"
+      )
+        | {{ notation(moves[moveIdx]) }}
+      .td(
+        v-if="moveIdx < moves.length-1"
+        :class="{'highlight-lm': cursor == moveIdx+1}"
+        @click="() => gotoMove(moveIdx+1)"
+      )
+        | {{ notation(moves[moveIdx+1]) }}
+      // Else: just add an empty cell
+      //.td(v-else)
+</template>
+
 <script>
 import { store } from "@/store";
+import { getFullNotation } from "@/utils/notation";
 export default {
   name: "my-move-list",
-  props: ["moves", "cursor", "score", "message", "firstNum"],
+  props: ["moves", "show", "cursor", "score", "message", "firstNum"],
+  data: function() {
+    return {
+      st: store.state
+    };
+  },
   watch: {
     cursor: function(newCursor) {
-      if (window.innerWidth <= 767) return; //moves list is below: scrolling would hide chessboard
-      // Count grouped moves until the cursor (if multi-moves):
-      let groupsCount = -1;
-      let curCol = undefined;
-      for (let i = 0; i < newCursor; i++) {
-        const m = this.moves[i];
-        if (m.color != curCol) {
-          groupsCount++;
-          curCol = m.color;
-        }
-      }
+      if (window.innerWidth <= 767) return; //scrolling would hide chessboard
       // $nextTick to wait for table > tr to be rendered
       this.$nextTick(() => {
-        let rows = document.querySelectorAll("#movesList tr");
-        if (rows.length > 0) {
-          rows[Math.floor(Math.max(groupsCount, 0) / 2)].scrollIntoView({
+        let curMove = document.querySelector(".td.highlight-lm");
+        if (curMove) {
+          curMove.scrollIntoView({
             behavior: "auto",
             block: "nearest"
           });
@@ -28,87 +47,15 @@ export default {
       });
     }
   },
-  render(h) {
-    if (this.moves.length == 0) return h("div");
-    let tableContent = [];
-    let moveCounter = 0;
-    let tableRow = undefined;
-    let moveCells = undefined;
-    let curCellContent = "";
-    let firstIndex = 0;
-    for (let i = 0; i < this.moves.length; i++) {
-      if (this.moves[i].color == "w") {
-        if (i == 0 || (i > 0 && this.moves[i - 1].color == "b")) {
-          if (tableRow) {
-            tableRow.children = moveCells;
-            tableContent.push(tableRow);
-          }
-          moveCells = [
-            h("td", { domProps: { innerHTML: ++moveCounter + "." } })
-          ];
-          tableRow = h("tr", {});
-          curCellContent = "";
-          firstIndex = i;
-        }
-      }
-      // Next condition is fine because even if the first move is black,
-      // there will be the "..." which count as white move.
-      else if (this.moves[i].color == "b" && this.moves[i - 1].color == "w")
-        firstIndex = i;
-      curCellContent += this.moves[i].notation;
-      if (
-        i < this.moves.length - 1 &&
-        this.moves[i + 1].color == this.moves[i].color
-      )
-        curCellContent += ",";
-      //color change
-      else {
-        moveCells.push(
-          h("td", {
-            domProps: { innerHTML: curCellContent },
-            on: { click: () => this.gotoMove(i) },
-            class: {
-              "highlight-lm": this.cursor >= firstIndex && this.cursor <= i
-            }
-          })
-        );
-        curCellContent = "";
-      }
-    }
-    // Complete last row, which might not be full:
-    if (moveCells.length - 1 == 1) {
-      moveCells.push(h("td", { domProps: { innerHTML: "" } }));
-    }
-    tableRow.children = moveCells;
-    tableContent.push(tableRow);
-    let rootElements = [];
-    if (!!this.score && this.score != "*") {
-      const scoreDiv = h(
-        "div",
-        {
-          id: "scoreInfo",
-          style: {
-            display: this.score != "*" ? "block" : "none"
-          }
-        },
-        [h("p", this.score), h("p", store.state.tr[this.message])]
-      );
-      rootElements.push(scoreDiv);
+  computed: {
+    evenNumbers: function() {
+      return [...Array(this.moves.length).keys()].filter(i => i%2==0);
     }
-    rootElements.push(
-      h(
-        "table",
-        {
-          class: {
-            "moves-list": true
-          }
-        },
-        tableContent
-      )
-    );
-    return h("div", {}, rootElements);
   },
   methods: {
+    notation: function(move) {
+      return getFullNotation(move);
+    },
     gotoMove: function(index) {
       this.$emit("goto-move", index);
     }
@@ -118,7 +65,28 @@ export default {
 
 <style lang="sass" scoped>
 .moves-list
-  min-width: 250px
-td.highlight-lm
+  cursor: pointer
+  min-height: 1px
+  max-height: 500px
+  overflow: auto
+  background-color: white
+  width: 280px
+  & > .tr
+    clear: both
+    border-bottom: 1px solid lightgrey
+    & > .td
+      float: left
+      padding: 2% 0 2% 1%
+      &:first-child
+        color: grey
+        width: 15%
+      &:not(first-child)
+        width: 41%
+
+@media screen and (max-width: 767px)
+  .moves-list
+    width: 100%
+
+.td.highlight-lm
   background-color: plum
 </style>