X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=e02462e578396744d76b069545c84fa39810e892;hb=9ca1e26b79ec1873aa6ac914013160f8593d52cf;hp=3b15742dc2bb29644659480c0851883a883cc521;hpb=f21cd6d9c23da37d729f20ea4c08e56b1a7b10a1;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 3b15742d..e02462e5 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,28 +1,27 @@
 <template lang="pug">
-.row
-  .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    input#modalEog.modal(type="checkbox")
-    div(role="dialog" aria-labelledby="eogMessage")
-      .card.smallpad.small-modal.text-center
-        label.modal-close(for="modalEog")
-        h3#eogMessage.section {{ endgameMessage }}
-    // TODO: or "BoardHex" if this.game.vname in "Hexagonal..."
-    Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
-      :user-color="game.mycolor" :orientation="orientation"
-      :vname="game.vname" @play-move="play")
-    .button-group
-      button(@click="() => play()") Play
-      button(@click="() => undo()") Undo
-      button(@click="flip") Flip
-      button(@click="gotoBegin") GotoBegin
-      button(@click="gotoEnd") GotoEnd
-    #messageDiv.section-content(v-if="game.type=='corr'") {{ curMoveMessage() }}
-    #fenDiv.section-content(v-if="showFen && !!vr")
-      p#fenString.text-center {{ vr.getFen() }}
-    #pgnDiv.section-content
-      a#download(href="#")
-      button#downloadBtn(@click="download") {{ st.tr["Download PGN"] }}
-    div#movesList
+div#baseGame(tabindex=-1 @click="() => focusBg()" @keydown="handleKeys")
+  input#modalEog.modal(type="checkbox")
+  div(role="dialog" aria-labelledby="eogMessage")
+    .card.smallpad.small-modal.text-center
+      label.modal-close(for="modalEog")
+      h3#eogMessage.section {{ endgameMessage }}
+  .row
+    .col-sm-12.col-md-9.col-lg-8
+      Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
+        :user-color="game.mycolor" :orientation="orientation"
+        :vname="game.vname" @play-move="play")
+      .button-group
+        button(@click="gotoBegin") <<
+        button(@click="() => undo()") <
+        button(@click="flip") &#8645;
+        button(@click="() => play()") >
+        button(@click="gotoEnd") >>
+      #fenDiv(v-if="showFen && !!vr")
+        p(@click="gotoFenContent") {{ vr.getFen() }}
+      #pgnDiv
+        a#download(href="#")
+        button(@click="download") {{ st.tr["Download PGN"] }}
+    .col-sm-12.col-md-3.col-lg-4
       MoveList(v-if="showMoves"
         :moves="moves" :cursor="cursor" @goto-move="gotoMove")
 </template>
@@ -52,6 +51,7 @@ export default {
       moves: [],
       cursor: -1, //index of the move just played
       lastMove: null,
+      gameHasEnded: false, //to avoid showing end message twice
     };
   },
   watch: {
@@ -59,6 +59,17 @@ export default {
     "game.fenStart": function() {
       this.re_setVariables();
     },
+    // Received a new move to play:
+    "game.moveToPlay": function() {
+      this.play(this.game.moveToPlay, "receive", this.game.vname=="Dark");
+    },
+    "game.score": function(score) {
+      if (!this.gameHasEnded && score != "*")
+      {
+        // "false" says "don't bubble up": the parent already knows
+        this.endGame(score, this.game.scoreMsg, false);
+      }
+    },
   },
   computed: {
     showMoves: function() {
@@ -69,7 +80,7 @@ export default {
       return this.game.vname != "Dark" || this.score != "*";
     },
     analyze: function() {
-      return this.game.mode == "analyze" || this.game.score != "*";
+      return this.game.mode == "analyze" || this.score != "*";
     },
   },
   created: function() {
@@ -77,10 +88,36 @@ export default {
       this.re_setVariables();
   },
   methods: {
+    focusBg: function() {
+      // TODO: small blue border appears...
+      document.getElementById("baseGame").focus();
+    },
+    handleKeys: function(e) {
+      switch (e.keyCode)
+      {
+        case 37:
+          this.undo();
+          break;
+        case 39:
+          this.play();
+          break;
+        case 28:
+          this.gotoBegin();
+          break;
+        case 40:
+          this.gotoEnd();
+          break;
+        case 32:
+          e.preventDefault();
+          this.flip();
+          break;
+      }
+    },
     re_setVariables: function() {
       this.endgameMessage = "";
       this.orientation = this.game.mycolor || "w"; //default orientation for observed games
       this.score = this.game.score || "*"; //mutable (if initially "*")
+      this.gameHasEnded = (this.score != "*");
       this.moves = JSON.parse(JSON.stringify(this.game.moves || []));
       // Post-processing: decorate each move with color + current FEN:
       // (to be able to jump to any position quickly)
@@ -93,18 +130,19 @@ export default {
         vr_tmp.play(move);
         move.fen = vr_tmp.getFen();
       });
+      if (this.game.fenStart.indexOf(" b ") >= 0 ||
+        (this.moves.length > 0 && this.moves[0].color == "b"))
+      {
+        // 'end' is required for Board component to check lastMove for e.p.
+        this.moves.unshift({color: "w", notation: "...", end: {x:-1,y:-1}});
+      }
       const L = this.moves.length;
       this.cursor = L-1;
       this.lastMove = (L > 0 ? this.moves[L-1]  : null);
     },
-    // For corr games, potential message with each move sent
-    curMoveMessage: function() {
-      if (this.cursor < 0)
-        return "";
-      return this.game.moves[this.cursor].message || "";
-    },
-    setCurrentMessage: function(message) {
-      this.game.moves[this.game.moves.length-1].message = message;
+    gotoFenContent: function(event) {
+      this.$router.push("/analyze/" + this.game.vname +
+        "/?fen=" + event.target.innerText.replace(/ /g, "_"));
     },
     download: function() {
       const content = this.getPgn();
@@ -164,12 +202,14 @@ export default {
       modalBox.checked = true;
       setTimeout(() => { modalBox.checked = false; }, 2000);
     },
-    endGame: function(score, message) {
+    endGame: function(score, message, bubbleUp) {
+      this.gameHasEnded = true;
       this.score = score;
       if (!message)
         message = this.getScoreMessage(score);
       this.showEndgameMsg(score + " . " + message);
-      this.$emit("gameover", score);
+      if (bubbleUp)
+        this.$emit("gameover", score);
     },
     animateMove: function(move) {
       let startSquare = document.getElementById(getSquareId(move.start));
@@ -251,7 +291,7 @@ export default {
       if (score != "*")
       {
         if (!this.analyze)
-          this.endGame(score);
+          this.endGame(score, undefined, true);
         else
         {
           // Just show score on screen (allow undo)