X-Git-Url: https://git.auder.net/assets/icon_infos.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=30ed2338f01c520e37b8269f24a46cd3b25c2d0b;hb=df647c70b4148894c7d87fc499df5a9050347aec;hp=90b76b43531a33d56434568911d08c4dd5689046;hpb=dac395887d96e2d642b209c6db6aaacc3ffacb34;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 90b76b43..30ed2338 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,120 +1,72 @@
 <script>
-// Component for moves list on the right
+import { store } from "@/store";
 export default {
-  name: 'my-move-list',
-  props: ["moves","cursor","score","message","firstNum"],
-  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;
-        }
-      }
-      // $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({
-            behavior: "auto",
-            block: "nearest",
-          });
-        }
-      });
-    },
-  },
+  name: "my-move-list",
+  props: ["moves", "cursor", "score", "message", "firstNum"],
   render(h) {
-    if (this.moves.length == 0)
-      return;
+    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)
-          {
+    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) + "." } }
-            )
+            h("td", { domProps: { innerHTML: ++moveCounter + "." } })
           ];
-          tableRow = h(
-            "tr",
-            { }
-          );
+          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")
+      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)
+      if (
+        i < this.moves.length - 1 &&
+        this.moves[i + 1].color == this.moves[i].color
+      )
         curCellContent += ",";
-      else //color change
-      {
+      //color change
+      else {
         moveCells.push(
-          h(
-            "td",
-            {
-              domProps: { innerHTML: curCellContent },
-              on: { click: () => this.gotoMove(i) },
-              "class": { "highlight-lm":
-                this.cursor >= firstIndex && this.cursor <= i },
+          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: "" } }
-        )
-      );
+    if (moveCells.length - 1 == 1) {
+      moveCells.push(h("td", { domProps: { innerHTML: "" } }));
     }
     tableRow.children = moveCells;
     tableContent.push(tableRow);
     let rootElements = [];
-    if (this.score != "*")
-    {
-      const scoreDiv = h("div",
+    if (!!this.score && this.score != "*") {
+      const scoreDiv = h(
+        "div",
         {
           id: "scoreInfo",
           style: {
-            display: this.score!="*" ? "block" : "none",
-          },
+            display: this.score != "*" ? "block" : "none"
+          }
         },
-        [
-          h("p", this.score),
-          h("p", this.message),
-        ]
+        [h("p", this.score), h("p", store.state.tr[this.message])]
       );
       rootElements.push(scoreDiv);
     }
@@ -122,37 +74,111 @@ export default {
       h(
         "table",
         {
-          "class": {
-            "moves-list": true,
-          },
+          class: {
+            "moves-list": true
+          }
         },
         tableContent
       )
     );
-    return h(
-      "div",
-      { },
-      rootElements);
+    return h("div", {}, rootElements);
+  },
+  watch: {
+    cursor: function(newCursor) {
+      if (window.innerWidth <= 767) return; //scrolling would hide chessboard
+      // Count grouped moves until the cursor (if multi-moves):
+      let groupsCount = 0;
+      let curCol = undefined;
+      for (let i = 0; i < newCursor; i++) {
+        const m = this.moves[i];
+        if (m.color != curCol) {
+          groupsCount++;
+          curCol = m.color;
+        }
+      }
+      // $nextTick to wait for table > tr to be rendered
+      this.$nextTick(() => {
+        let rows = document.querySelectorAll("#movesList tr");
+        if (rows.length > 0) {
+          rows[Math.floor(groupsCount / 2)].scrollIntoView({
+            behavior: "auto",
+            block: "nearest"
+          });
+        }
+      });
+    }
   },
   methods: {
     gotoMove: function(index) {
       this.$emit("goto-move", index);
-    },
-  },
+    }
+  }
 };
 </script>
 
 <style lang="sass" scoped>
 .moves-list
   min-width: 250px
-@media screen and (max-width: 767px)
-  .moves-list
-    tr
-      display: flex
-      margin: 0
-      padding: 0
-      td
-        text-align: left
+
 td.highlight-lm
   background-color: plum
 </style>
+
+<!-- TODO: use template function + multi-moves: much easier
+<template lang="pug">
+div
+  #scoreInfo(v-if="score!='*'")
+    p {{ score }}
+    p {{ message }}
+  table.moves-list
+    tbody
+      tr(v-for="moveIdx in evenNumbers")
+        td {{ firstNum + moveIdx / 2 + 1 }}
+        td(:class="{'highlight-lm': cursor == moveIdx}"
+            @click="() => gotoMove(moveIdx)")
+          | {{ moves[moveIdx].notation }}
+        td(v-if="moveIdx < moves.length-1"
+            :class="{'highlight-lm': cursor == moveIdx+1}"
+            @click="() => gotoMove(moveIdx+1)")
+          | {{ moves[moveIdx+1].notation }}
+        // Else: just add an empty cell
+        td(v-else)
+</template>
+
+<script>
+// Component for moves list on the right
+export default {
+  name: 'my-move-list',
+	props: ["moves","cursor","score","message","firstNum"],
+  watch: {
+    cursor: function(newValue) {
+      if (window.innerWidth <= 767)
+        return; //moves list is below: scrolling would hide chessboard
+      if (newValue < 0)
+        newValue = 0; //avoid rows[-1] => error
+      // $nextTick to wait for table > tr to be rendered
+      this.$nextTick( () => {
+        let rows = document.querySelectorAll('#movesList tr');
+        if (rows.length > 0)
+        {
+          rows[Math.floor(newValue/2)].scrollIntoView({
+            behavior: "auto",
+            block: "nearest",
+          });
+        }
+      });
+    },
+  },
+  computed: {
+    evenNumbers: function() {
+      return [...Array(this.moves.length).keys()].filter(i => i%2==0);
+    },
+  },
+  methods: {
+		gotoMove: function(index) {
+			this.$emit("goto-move", index);
+		},
+	},
+};
+</script>
+-->