X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=0dede66001fb81cf2fae2038d9624211e1321f9a;hb=bd76b45611cbb58dcf774745a4d690277a82aacd;hp=73c10f0fbf771c87084fa030e009effa547aab71;hpb=144c900354f828ff2321a94db364bf436bff4586;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 73c10f0f..0dede660 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,41 +1,30 @@
-<template lang="pug">
-div
-  #scoreInfo(v-if="score!='*'")
-    p {{ score }}
-    p {{ message }}
-  table.moves-list
-    tbody
-      tr(v-for="gmove,index in groupedMoves")
-        td(v-if="index%2==0")
-          | {{ firstNum + index / 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"],
+  props: ["moves","cursor","score","message","firstNum"],
   watch: {
-    cursor: function(newValue) {
+    cursor: function(newCursor) {
       if (window.innerWidth <= 767)
         return; //moves list is below: scrolling would hide chessboard
-      if (newValue < 0)
-        newValue = 0; //avoid rows[-1] --> error
+      // 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(newValue/2)].scrollIntoView({
+          rows[Math.floor(Math.max(groupsCount,0)/2)].scrollIntoView({
             behavior: "auto",
             block: "nearest",
           });
@@ -43,46 +32,119 @@ export default {
       });
     },
   },
-  computed: {
-    groupedMoves: function() {
-      let groups = [];
-      let curCol = undefined;
-      for (let idx=0; idx < this.moves.length; idx++)
+  render(h) {
+    if (this.moves.length == 0)
+      return;
+    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")
       {
-        const m = this.moves[idx];
-        if (m.color == curCol)
-        {
-          const gidx = groups.length - 1;
-          groups[gidx].moves.push(m);
-        }
-        else
+        if (i == 0 || i>0 && this.moves[i-1].color=="b")
         {
-          curCol = m.color;
-          groups.push({moves: [m], idx: groups.length});
+          if (!!tableRow)
+          {
+            tableRow.children = moveCells;
+            tableContent.push(tableRow);
+          }
+          moveCells = [
+            h(
+              "td",
+              { domProps: { innerHTML: (++moveCounter) + "." } }
+            )
+          ];
+          tableRow = h(
+            "tr",
+            { }
+          );
+          curCellContent = "";
+          firstIndex = i;
         }
       }
-      return groups;
-    },
+      // 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(
+            "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);
+    }
+    rootElements.push(
+      h(
+        "table",
+        {
+          "class": {
+            "moves-list": true,
+          },
+        },
+        tableContent
+      )
+    );
+    return h(
+      "div",
+      { },
+      rootElements);
   },
   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
-@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>