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

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 987329c8..73c10f0f 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,86 +1,70 @@
+<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
 export default {
   name: 'my-move-list',
-	props: ["moves","cursor"],
-	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)
-		{
-      moveCells.push(
-        h(
-          "td",
-          { domProps: { innerHTML: "" } }
-        )
-      );
-		}
-		tableRow.children = moveCells;
-		tableContent.push(tableRow);
-		const movesTable = h(
-      "div",
-      { },
-      [h(
-			  "table",
-			  {
-          "class": {
-            "moves-list": true,
-          },
-        },
-			  tableContent
-		  )]
-    );
-		return movesTable;
-	},
-	methods: {
+	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: {
+    groupedMoves: function() {
+      let groups = [];
+      let curCol = undefined;
+      for (let idx=0; idx < this.moves.length; idx++)
+      {
+        const m = this.moves[idx];
+        if (m.color == curCol)
+        {
+          const gidx = groups.length - 1;
+          groups[gidx].moves.push(m);
+        }
+        else
+        {
+          curCol = m.color;
+          groups.push({moves: [m], idx: groups.length});
+        }
+      }
+      return groups;
+    },
+  },
+  methods: {
 		gotoMove: function(index) {
 			this.$emit("goto-move", index);
 		},
@@ -91,4 +75,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>