X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=1ad88b4e16f5aef44eb277989b3882bc2a60542f;hb=f41ce5806b989c06091a403d7e26ff3c457650c9;hp=433151c72b831f0df0cf5684ccba9ebd59c2665e;hpb=411d23cd80a2dbf53d21008976d34e7f450154bf;p=vchess.git
diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 433151c7..1ad88b4e 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -90,7 +90,7 @@ export default {
gdisplay: "live",
games: [],
challenges: [],
- people: [], //(all) online players
+ people: [], //people in main hall
infoMessage: "",
newchallenge: {
fen: "",
@@ -110,7 +110,7 @@ export default {
});
this.games.forEach(g => {
if (g.vname == "")
- g.vname = this.getVname(g.vid)
+ g.vname = this.getVname(g.vid);
});
},
},
@@ -224,10 +224,10 @@ export default {
}
this.$router.push(url);
},
- // TODO: ...filter(...)[0].name, one-line, just remove this function
getVname: function(vid) {
- const vIdx = this.st.variants.findIndex(v => v.id == vid);
- return vIdx >= 0 ? this.st.variants[vIdx].name : "";
+ const variant = this.st.variants.find(v => v.id == vid);
+ // this.st.variants might be uninitialized (variant == null)
+ return (!!variant ? variant.name : "");
},
getSid: function(pname) {
const pIdx = this.people.findIndex(pl => pl.name == pname);
@@ -381,8 +381,8 @@ export default {
else
{
this.infoMessage = "New game started: " +
- "" +
- "/game/" + data.gameInfo.gameId + "";
+ "" +
+ "#/game/" + data.gameInfo.gameId + "";
let modalBox = document.getElementById("modalInfo");
modalBox.checked = true;
setTimeout(() => { modalBox.checked = false; }, 3000);
@@ -452,7 +452,8 @@ export default {
chall.vname = vname;
chall.from = this.people[0]; //avoid sending email
this.challenges.push(chall);
- localStorage.setItem("challenge", JSON.stringify(chall));
+ if (ctype == "live")
+ localStorage.setItem("challenge", JSON.stringify(chall));
document.getElementById("modalNewgame").checked = false;
};
const cIdx = this.challenges.findIndex(
@@ -515,7 +516,6 @@ export default {
}
else //my challenge
{
- localStorage.removeItem("challenge");
if (c.type == "corr")
{
ajax(
@@ -524,6 +524,8 @@ export default {
{id: c.id}
);
}
+ else //live
+ localStorage.removeItem("challenge");
}
// In (almost) all cases, the challenge is consumed:
ArrayFun.remove(this.challenges, ch => ch.id == c.id);
@@ -541,6 +543,7 @@ export default {
fen: c.fen || V.GenRandInitFen(),
players: shuffle([c.from, c.seat]), //white then black
vid: c.vid,
+ vname: c.vname, //theoretically vid is enough, but much easier with vname
timeControl: c.timeControl,
};
let target = c.from.sid; //may not be defined if corr + offline opp
@@ -581,7 +584,7 @@ export default {
const game = Object.assign({}, gameInfo, {
// (other) Game infos: constant
fenStart: gameInfo.fen,
- created: Date.now(),
+ added: Date.now(),
// Game state (including FEN): will be updated
moves: [],
clocks: [-1, -1], //-1 = unstarted