X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=0dede66001fb81cf2fae2038d9624211e1321f9a;hb=2f258c37c19c5be20ec68695ddfaec2c21f7f0ae;hp=70756cc3d4ff0be7b4ca5eabbe363f2cb54f9bfd;hpb=430a203855578f9bbf4c851165c6066a741ff1f8;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 70756cc3..0dede660 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,154 +1,150 @@
-<template lang="pug">
-div
-  #scoreInfo(v-if="score!='*'")
-    p {{ score }}
-    p {{ message }}
-  table#movesList
-    tbody
-      tr(v-for="moveIdx in evenNumbers")
-        td {{ moveIdx / 2 + 1 }}
-        td(:class="{'highlight-lm': cursor == moveIdx}"
-            data-label="White move" @click="() => gotoMove(moveIdx)")
-          | {{ moves[moveIdx].notation }}
-        td(v-if="moveIdx < moves.length-1"
-            :class="{'highlight-lm': cursor == moveIdx+1}"
-            data-label="Black move" @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"],
+  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
+      // 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({
-            behavior: 'smooth',
-            block: 'center'
+          rows[Math.floor(Math.max(groupsCount,0)/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>
-
-<style lang="sass" scoped>
-.moves-list
-  min-width: 250px
-td.highlight-lm
-  background-color: plum
-</style>
-
-<!-- Old render method:
   render(h) {
-		if (this.moves.length == 0)
-			return;
-		let tableContent = [];
-		let moveCounter = 0;
-		let tableRow = undefined;
-		let moveCells = undefined;
-		let curCellContent = "";
-		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 = "";
-				}
-			}
-			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 == i },
-						}
-					)
-				);
-				curCellContent = "";
-			}
-		}
-		// Complete last row, which might not be full:
-		if (moveCells.length-1 == 1)
-		{
+    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")
+      {
+        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 += ",";
+      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);
-    const scoreDiv = h("div",
-      {
-        id: "scoreInfo",
-        style: {
-          display: this.score!="*" ? "block" : "none",
+    }
+    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,
+          },
         },
-      },
-      [
-        h("p", this.score),
-        h("p", this.message),
-      ]
+        tableContent
+      )
     );
-		const movesTable = h(
+    return h(
       "div",
       { },
-      [
-        scoreDiv,
-        h(
-          "table",
-          {
-            "class": {
-              "moves-list": true,
-            },
-          },
-          tableContent
-		    )
-      ]
-    );
-		return movesTable;
-	},
--->
+      rootElements);
+  },
+  methods: {
+    gotoMove: function(index) {
+      this.$emit("goto-move", index);
+    },
+  },
+};
+</script>
+
+<style lang="sass" scoped>
+.moves-list
+  min-width: 250px
+td.highlight-lm
+  background-color: plum
+</style>