X-Git-Url: https://git.auder.net/doc/screen_ranking.png?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=5c82b0b1573975e88df06dd4cf0089fb5d1e7a3d;hb=72ccbd6730241771e6ba86b6a5b62597b4c7e2f4;hp=6d9904e6004af57ceacd75f16dcb0a8e1fccb2d0;hpb=52a8ab55fed35fcbf8d00d4952fb32dd3535f5b7;p=vchess.git
diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 6d9904e6..5c82b0b1 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,27 +1,27 @@
-div
+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
+ #boardContainer.col-sm-12.col-md-9
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
+ #controls
+ button(@click="gotoBegin") <<
+ button(@click="() => undo()") <
+ button(@click="flip") ⇅
+ button(@click="() => play()") >
+ button(@click="gotoEnd") >>
#fenDiv(v-if="showFen && !!vr")
- p {{ vr.getFen() }}
+ 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
+ .col-sm-12.col-md-3
MoveList(v-if="showMoves"
:moves="moves" :cursor="cursor" @goto-move="gotoMove")
@@ -51,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: {
@@ -63,8 +64,11 @@ export default {
this.play(this.game.moveToPlay, "receive", this.game.vname=="Dark");
},
"game.score": function(score) {
- if (score != "*")
- this.endGame(score, this.game.scoreMsg);
+ if (!this.gameHasEnded && score != "*")
+ {
+ // "false" says "don't bubble up": the parent already knows
+ this.endGame(score, this.game.scoreMsg, false);
+ }
},
},
computed: {
@@ -84,10 +88,37 @@ export default {
this.re_setVariables();
},
methods: {
+ focusBg: function() {
+ // TODO: small blue border appears...
+ document.getElementById("baseGame").focus();
+ },
+ handleKeys: function(e) {
+ if ([32,37,38,39,40].includes(e.keyCode))
+ e.preventDefault();
+ switch (e.keyCode)
+ {
+ case 37:
+ this.undo();
+ break;
+ case 39:
+ this.play();
+ break;
+ case 38:
+ this.gotoBegin();
+ break;
+ case 40:
+ this.gotoEnd();
+ break;
+ case 32:
+ 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)
@@ -100,10 +131,20 @@ 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);
},
+ gotoFenContent: function(event) {
+ this.$router.push("/analyze/" + this.game.vname +
+ "/?fen=" + event.target.innerText.replace(/ /g, "_"));
+ },
download: function() {
const content = this.getPgn();
// Prepare and trigger download link
@@ -162,12 +203,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));
@@ -249,7 +292,7 @@ export default {
if (score != "*")
{
if (!this.analyze)
- this.endGame(score);
+ this.endGame(score, undefined, true);
else
{
// Just show score on screen (allow undo)
@@ -282,8 +325,16 @@ export default {
},
gotoBegin: function() {
this.vr.re_init(this.game.fenStart);
- this.cursor = -1;
- this.lastMove = null;
+ if (this.moves.length > 0 && this.moves[0].notation == "...")
+ {
+ this.cursor = 0;
+ this.lastMove = this.moves[0];
+ }
+ else
+ {
+ this.cursor = -1;
+ this.lastMove = null;
+ }
},
gotoEnd: function() {
this.gotoMove(this.moves.length-1);
@@ -294,3 +345,29 @@ export default {
},
};
+
+