X-Git-Url: https://git.auder.net/images/pieces/Cwda/bd.svg?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=f7c6775cf87e1b32c2871b836ee3ba816dd5a00c;hb=5fbc0680d484bf6b8f4ea183f26bbe22797f92a3;hp=0d7a4ee90b1dd1ceb3ec706ffd82ddaa00677403;hpb=07052665845283c65b50a76537669d0602ba436b;p=vchess.git
diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 0d7a4ee9..f7c6775c 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -7,7 +7,7 @@ main
)
.card
label.modal-close(for="modalRules")
- h4#variantNameInGame(@click="gotoRules") {{ game.vname }}
+ a#variantNameInGame(:href="'/#/variants/'+game.vname") {{ game.vname }}
div(v-html="rulesContent")
input#modalScore.modal(type="checkbox")
div#scoreDiv(
@@ -84,39 +84,42 @@ main
@click="showNextGame()"
)
| {{ st.tr["Next_g"] }}
- button#chatBtn.tooltip(
+ button#chatBtn(
+ :class="btnTooltipClass()"
onClick="window.doClick('modalChat')"
aria-label="Chat"
)
img(src="/images/icons/chat.svg")
#actions(v-if="game.score=='*'")
- button.tooltip(
+ button(
@click="clickDraw()"
- :class="{['draw-' + drawOffer]: true}"
+ :class="btnTooltipClass('draw')"
:aria-label="st.tr['Draw']"
)
img(src="/images/icons/draw.svg")
- button.tooltip(
+ button(
v-if="!!game.mycolor"
+ :class="btnTooltipClass()"
@click="abortGame()"
:aria-label="st.tr['Abort']"
)
img(src="/images/icons/abort.svg")
- button.tooltip(
+ button(
v-if="!!game.mycolor"
+ :class="btnTooltipClass()"
@click="resign()"
:aria-label="st.tr['Resign']"
)
img(src="/images/icons/resign.svg")
- button.tooltip(
+ button(
v-else
+ :class="btnTooltipClass('rematch')"
@click="clickRematch()"
- :class="{['rematch-' + rematchOffer]: true}"
:aria-label="st.tr['Rematch']"
)
img(src="/images/icons/rematch.svg")
#playersInfo
- p(v-if="isLargeScreen()")
+ div(v-if="isLargeScreen()")
span.name(:class="{connected: isConnected(0)}")
| {{ game.players[0].name || "@nonymous" }}
span.time(
@@ -138,30 +141,24 @@ main
span.time-separator(v-if="!!virtualClocks[1][1]") :
span.time-right(v-if="!!virtualClocks[1][1]")
| {{ virtualClocks[1][1] }}
- p(v-else)
+ div(v-else)
span.name(:class="{connected: isConnected(0)}")
| {{ game.players[0].name || "@nonymous" }}
span.split-names -
span.name(:class="{connected: isConnected(1)}")
| {{ game.players[1].name || "@nonymous" }}
- br
- span.time(
- v-if="game.score=='*'"
- :class="{yourturn: !!vr && vr.turn == 'w'}"
- )
- span.time-left {{ virtualClocks[0][0] }}
- span.time-separator(v-if="!!virtualClocks[0][1]") :
- span.time-right(v-if="!!virtualClocks[0][1]")
- | {{ virtualClocks[0][1] }}
- span.separator
- span.time(
- v-if="game.score=='*'"
- :class="{yourturn: !!vr && vr.turn == 'b'}"
- )
- span.time-left {{ virtualClocks[1][0] }}
- span.time-separator(v-if="!!virtualClocks[1][1]") :
- span.time-right(v-if="!!virtualClocks[1][1]")
- | {{ virtualClocks[1][1] }}
+ div(v-if="game.score=='*'")
+ span.time(:class="{yourturn: !!vr && vr.turn == 'w'}")
+ span.time-left {{ virtualClocks[0][0] }}
+ span.time-separator(v-if="!!virtualClocks[0][1]") :
+ span.time-right(v-if="!!virtualClocks[0][1]")
+ | {{ virtualClocks[0][1] }}
+ span.separator
+ span.time(:class="{yourturn: !!vr && vr.turn == 'b'}")
+ span.time-left {{ virtualClocks[1][0] }}
+ span.time-separator(v-if="!!virtualClocks[1][1]") :
+ span.time-right(v-if="!!virtualClocks[1][1]")
+ | {{ virtualClocks[1][1] }}
BaseGame(
ref="basegame"
:game="game"
@@ -255,6 +252,9 @@ export default {
},
// NOTE: some redundant code with Hall.vue (mostly related to people array)
created: function() {
+ if (this.$route.query["focus"] === "false")
+ // Focus explicitely set to false from Hall (live game)
+ this.focus = false;
this.atCreation();
},
mounted: function() {
@@ -270,12 +270,6 @@ export default {
.addEventListener("click", processModalClick);
}
);
- if ("ontouchstart" in window) {
- // Disable tooltips on smartphones:
- document.querySelectorAll("#aboveBoard .tooltip").forEach(elt => {
- elt.classList.remove("tooltip");
- });
- }
},
beforeDestroy: function() {
this.cleanBeforeDestroy();
@@ -296,11 +290,6 @@ export default {
visibilityChange: function() {
// TODO: Use document.hidden? https://webplatform.news/issues/2019-03-27
this.focus = (document.visibilityState == "visible");
- if (!this.focus && !!this.rematchOffer) {
- this.rematchOffer = "";
- this.send("rematchoffer", { data: false });
- // Do not remove rematch offer from (local) storage
- }
this.send(this.focus ? "getfocus" : "losefocus");
},
onFocus: function() {
@@ -309,17 +298,20 @@ export default {
},
onBlur: function() {
this.focus = false;
- if (!!this.rematchOffer) {
- this.rematchOffer = "";
- this.send("rematchoffer", { data: false });
- }
this.send("losefocus");
},
isLargeScreen: function() {
- return window.innerWidth >= 500;
+ return window.innerWidth >= 768;
},
- gotoRules: function() {
- this.$router.push("/variants/" + this.game.vname);
+ btnTooltipClass: function(thing) {
+ let append = {};
+ if (!!thing) append = { [thing + "-" + this[thing + "Offer"]]: true };
+ return (
+ Object.assign(
+ { tooltip: !("ontouchstart" in window) },
+ append
+ )
+ );
},
participateInChat: function(p) {
return Object.keys(p.tmpIds).some(x => p.tmpIds[x].focus) && !!p.name;
@@ -437,10 +429,14 @@ export default {
isConnected: function(index) {
const player = this.game.players[index];
// Is it me ? In this case no need to bother with focus
- if (this.st.user.sid == player.sid || this.st.user.id == player.id)
+ if (
+ this.st.user.sid == player.sid ||
+ (!!player.name && this.st.user.id == player.id)
+ ) {
// Still have to check for name (because of potential multi-accounts
// on same browser, although this should be rare...)
return (!this.st.user.name || this.st.user.name == player.name);
+ }
// Try to find a match in people:
return (
(
@@ -454,7 +450,7 @@ export default {
)
||
(
- !!player.id &&
+ player.id > 0 &&
Object.values(this.people).some(p => {
return (
p.id == player.id &&
@@ -678,7 +674,6 @@ export default {
!this.gotLastate &&
!!this.game.mycolor &&
this.game.type == "live" &&
- this.game.score == "*" &&
this.game.players.some(p => p.sid == user.sid)
) {
this.send("asklastate", { target: user.sid });
@@ -815,12 +810,26 @@ export default {
GameStorage.update(this.gameRef, { drawOffer: "" });
}
}
- this.$refs["basegame"].play(
- movePlus.move, "received", null, true);
- this.game.clocks[moveColIdx] = movePlus.clock;
- this.processMove(
- movePlus.move,
- { receiveMyMove: receiveMyMove }
+ this.$refs["basegame"].play(movePlus.move, "received");
+ // Freeze time while the move is being play
+ // (TODO: a callback would be cleaner here)
+ clearInterval(this.clockUpdate);
+ this.clockUpdate = null;
+ const freezeDuration = ["all", "highlight"].includes(V.ShowMoves)
+ // 250 = length of animation, 500 = delay between sub-moves
+ ? 250 + 750 *
+ (Array.isArray(movePlus.move) ? movePlus.move.length - 1 : 0)
+ // Incomplete information: no move animation
+ : 0;
+ setTimeout(
+ () => {
+ this.game.clocks[moveColIdx] = movePlus.clock;
+ this.processMove(
+ movePlus.move,
+ { receiveMyMove: receiveMyMove }
+ );
+ },
+ freezeDuration
);
}
}
@@ -863,7 +872,7 @@ export default {
if (!!this.game.mycolor && this.game.type == "live") {
GameStorage.update(
this.gameRef,
- { rematchOffer: V.GetOppCol(this.game.mycolor) }
+ { rematchOffer: data.data ? V.GetOppCol(this.game.mycolor) : "" }
);
}
break;
@@ -878,11 +887,14 @@ export default {
this.addAndGotoLiveGame(gameInfo);
} else if (
gameType == "corr" &&
+ this.st.user.id > 0 &&
gameInfo.players.some(p => p.id == this.st.user.id)
) {
this.$router.push("/game/" + gameInfo.id);
} else {
this.rematchId = gameInfo.id;
+ document.getElementById("modalRules").checked = false;
+ document.getElementById("modalScore").checked = false;
document.getElementById("modalRematch").checked = true;
}
break;
@@ -928,8 +940,8 @@ export default {
clock: this.game.clocks[myIdx],
// Since we played a move (or abort or resign),
// only drawOffer=="sent" is possible
- drawSent: this.drawOffer == "sent",
- rematchSent: this.rematchOffer == "sent",
+ drawSent: this.drawOffer == "sent" ? true : undefined,
+ rematchSent: this.rematchOffer == "sent" ? true : undefined,
score: this.game.score != "*" ? this.game.score : undefined,
scoreMsg: this.game.score != "*" ? this.game.scoreMsg : undefined,
movesCount: L
@@ -940,23 +952,47 @@ export default {
processLastate: function() {
const data = this.lastate;
this.lastate = undefined; //security...
- const L = this.game.moves.length;
- const oppIdx = 1 - ["w", "b"].indexOf(this.game.mycolor);
- this.game.clocks[oppIdx] = data.clock;
- if (data.movesCount > L) {
- // Just got last move from him
- this.$refs["basegame"].play(data.lastMove, "received", null, true);
- this.processMove(data.lastMove);
- } else {
- if (!!this.clockUpdate) clearInterval(this.clockUpdate);
- this.re_setClocks();
- }
- if (data.drawSent) this.drawOffer = "received";
- if (data.rematchSent) this.rematchOffer = "received";
if (!!data.score) {
- this.drawOffer = "";
- if (this.game.score == "*")
- this.gameOver(data.score, data.scoreMsg);
+ const oppCol = V.GetOppCol(this.game.mycolor);
+ if (!!data.rematchSent) {
+ if (this.game.rematchOffer != oppCol) {
+ // Opponent sended rematch offer while we were offline:
+ this.rematchOffer = "received";
+ GameStorage.update(
+ this.gameRef,
+ { rematchOffer: oppCol }
+ );
+ }
+ }
+ else {
+ if (this.game.rematchOffer == oppCol) {
+ // Opponent cancelled rematch offer while we were offline:
+ this.rematchOffer = "";
+ GameStorage.update(
+ this.gameRef,
+ { rematchOffer: "" }
+ );
+ }
+ }
+ }
+ else {
+ const L = this.game.moves.length;
+ const oppIdx = 1 - ["w", "b"].indexOf(this.game.mycolor);
+ this.game.clocks[oppIdx] = data.clock;
+ if (data.movesCount > L) {
+ // Just got last move from him
+ this.$refs["basegame"].play(data.lastMove, "received");
+ this.processMove(data.lastMove);
+ } else {
+ if (!!this.clockUpdate) clearInterval(this.clockUpdate);
+ this.re_setClocks();
+ }
+ if (!!data.drawSent) this.drawOffer = "received";
+ if (!!data.score) {
+ this.drawOffer = "";
+ if (this.game.score == "*")
+ this.gameOver(data.score, data.scoreMsg);
+ }
}
},
clickDraw: function() {
@@ -1088,7 +1124,10 @@ export default {
const gtype = game.type || this.getGameType(game);
const tc = extractTime(game.cadence);
const myIdx = game.players.findIndex(p => {
- return p.sid == this.st.user.sid || p.id == this.st.user.id;
+ return (
+ p.sid == this.st.user.sid ||
+ (!!p.name && p.id == this.st.user.id)
+ );
});
// Sometimes the name isn't stored yet (TODO: why?)
if (
@@ -1180,8 +1219,9 @@ export default {
if (
(game.rematchOffer == "w" && myIdx == 0) ||
(game.rematchOffer == "b" && myIdx == 1)
- )
+ ) {
this.rematchOffer = "sent";
+ }
else this.rematchOffer = "received";
}
}
@@ -1243,21 +1283,21 @@ export default {
await import("@/variants/" + game.vname + ".js")
.then((vModule) => {
window.V = vModule[game.vname + "Rules"];
- // (AJAX) Request to get rules content (plain text, HTML)
- this.rulesContent =
- require(
- "raw-loader!@/translations/rules/" +
- game.vname + "/" +
- this.st.lang + ".pug"
- )
- // Next two lines fix a weird issue after last update (2019-11)
- .replace(/\\n/g, " ")
- .replace(/\\"/g, '"')
- .replace('module.exports = "', "")
- .replace(/"$/, "")
- .replace(/(fen:)([^:]*):/g, replaceByDiag);
this.loadGame(game, callback);
});
+ // (AJAX) Request to get rules content (plain text, HTML)
+ this.rulesContent =
+ require(
+ "raw-loader!@/translations/rules/" +
+ game.vname + "/" +
+ this.st.lang + ".pug"
+ )
+ // Next two lines fix a weird issue after last update (2019-11)
+ .replace(/\\n/g, " ")
+ .replace(/\\"/g, '"')
+ .replace('module.exports = "', "")
+ .replace(/"$/, "")
+ .replace(/(fen:)([^:]*):/g, replaceByDiag);
},
// 3 cases for loading a game:
// - from indexedDB (running or completed live game I play)
@@ -1566,11 +1606,15 @@ export default {
this.game.score = score;
if (!scoreMsg) scoreMsg = getScoreMessage(score);
this.game.scoreMsg = scoreMsg;
+ document.getElementById("modalRules").checked = false;
// Display result in a un-missable way:
document.getElementById("modalScore").checked = true;
this.$set(this.game, "scoreMsg", scoreMsg);
const myIdx = this.game.players.findIndex(p => {
- return p.sid == this.st.user.sid || p.id == this.st.user.id;
+ return (
+ p.sid == this.st.user.sid ||
+ (!!p.name && p.id == this.st.user.id)
+ );
});
if (myIdx >= 0) {
// OK, I play in this game
@@ -1610,19 +1654,22 @@ export default {