X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=48f082f4cd0b8bb372a008abca6fc81b3fed0feb;hb=8477e53d8e78606e4c4e4bf91c77b1011aab583c;hp=ca538924290b548d9c88b3dab55f51e1de252724;hpb=96e9585a39ca3ccef59c701b3f7ac3809692ca73;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index ca538924..48f082f4 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,61 +1,146 @@
-<template lang="pug">
-div
-  #scoreInfo(v-if="score!='*'")
-    p {{ score }}
-    p {{ message }}
-  table#movesList
-    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
+import { store } from "@/store";
 export default {
-  name: 'my-move-list',
-	props: ["moves","cursor","score","message","firstNum"],
+  name: "my-move-list",
+  props: ["moves", "cursor", "score", "message", "firstNum"],
+  render(h) {
+    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);
+    }
+    if (this.moves.length > 0) {
+      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(
+                "div",
+                {
+                  "class": {td: true},
+                  domProps: { innerHTML: ++moveCounter + "." }
+                }
+              )
+            ];
+            tableRow = h("div", {"class": {tr: true}});
+            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 += ",";
+        else {
+          // Color change
+          moveCells.push(
+            h(
+              "div",
+              {
+                "class": {
+                  td: true,
+                  "highlight-lm": this.cursor >= firstIndex && this.cursor <= i
+                },
+                domProps: { innerHTML: curCellContent },
+                on: { click: () => this.gotoMove(i) }
+              }
+            )
+          );
+          curCellContent = "";
+        }
+      }
+      // Complete last row, which might not be full:
+      if (moveCells.length - 1 == 1) {
+        moveCells.push(h("div", {"class": {td: true}}));
+      }
+      tableRow.children = moveCells;
+      tableContent.push(tableRow);
+      rootElements.push(
+        h(
+          "div",
+          {
+            class: {
+              "moves-list": true
+            }
+          },
+          tableContent
+        )
+      );
+    }
+    return h("div", {}, rootElements);
+  },
   watch: {
-    cursor: function(newValue) {
-      if (newValue < 0)
-        newValue = 0; //avoid rows[-1] --> error
+    cursor: function(newCursor) {
+      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(newValue/2)].scrollIntoView({
+      this.$nextTick(() => {
+        let curMove = document.querySelector(".td.highlight-lm");
+        if (curMove) {
+          curMove.scrollIntoView({
             behavior: "auto",
-            block: "nearest",
+            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);
-		},
-	},
+    gotoMove: function(index) {
+      this.$emit("goto-move", index);
+    }
+  }
 };
 </script>
 
 <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>