X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=e50047d907c952ece8e059c33eddd2adff4fb98e;hb=5fde3a01497262862afc4cb4c9457d4e0ad69a4a;hp=c63f2cdfe733691496d10b2015488502c74835bd;hpb=5157ce0b8872417fbeecd736c9d1ae750b24acdc;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index c63f2cdf..e50047d9 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,38 +1,30 @@
-<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}"
-            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
 export default {
   name: 'my-move-list',
 	props: ["moves","cursor","score","message","firstNum"],
   watch: {
-    cursor: function(newValue) {
-      if (newValue < 0)
-        newValue = 0; //avoid rows[-1] --> error
+    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({
+          rows[Math.floor(Math.max(groupsCount,0)/2)].scrollIntoView({
             behavior: "auto",
             block: "nearest",
           });
@@ -40,11 +32,108 @@ export default {
       });
     },
   },
-  computed: {
-    evenNumbers: function() {
-      return [...Array(this.moves.length).keys()].filter(i => i%2==0);
-    },
-  },
+	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")
+			{
+				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);
+    let rootElements = [];
+    if (this.score != "*")
+    {
+      const scoreDiv = h("div",
+        {
+          id: "scoreInfo",
+          style: {
+            display: this.score!="*" ? "block" : "none",
+          },
+        },
+        [
+          h("p", this.score),
+          h("p", 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);
@@ -56,6 +145,14 @@ export default {
 <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>