projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'update'
[vchess.git]
/
client
/
src
/
views
/
Hall.vue
diff --git
a/client/src/views/Hall.vue
b/client/src/views/Hall.vue
index
132c31b
..
fd4bd2d
100644
(file)
--- a/
client/src/views/Hall.vue
+++ b/
client/src/views/Hall.vue
@@
-99,7
+99,7
@@
main
button(@click="issueNewChallenge()") {{ st.tr["Send challenge"] }}
input#modalPeople.modal(
type="checkbox"
button(@click="issueNewChallenge()") {{ st.tr["Send challenge"] }}
input#modalPeople.modal(
type="checkbox"
- @click="
reset
SocialColor()"
+ @click="
toggle
SocialColor()"
)
div#peopleWrap(
role="dialog"
)
div#peopleWrap(
role="dialog"
@@
-135,7
+135,7
@@
main
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
.button-group
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
.button-group
- button#peopleBtn(
@click="openModalPeople(
)")
+ button#peopleBtn(
onClick="window.doClick('modalPeople'
)")
| {{ st.tr["Who's there?"] }}
button(@click="showNewchallengeForm()")
| {{ st.tr["New game"] }}
| {{ st.tr["Who's there?"] }}
button(@click="showNewchallengeForm()")
| {{ st.tr["New game"] }}
@@
-205,6
+205,7
@@
main
<script>
import { store } from "@/store";
import { checkChallenge } from "@/data/challengeCheck";
<script>
import { store } from "@/store";
import { checkChallenge } from "@/data/challengeCheck";
+import { notify } from "@/utils/notifications";
import { ArrayFun } from "@/utils/array";
import { ajax } from "@/utils/ajax";
import params from "@/parameters";
import { ArrayFun } from "@/utils/array";
import { ajax } from "@/utils/ajax";
import params from "@/parameters";
@@
-248,6
+249,7
@@
export default {
diag: "", //visualizing FEN
memorize: false //put settings in localStorage
},
diag: "", //visualizing FEN
memorize: false //put settings in localStorage
},
+ focus: true,
tchallDiag: "",
curChallToAccept: {from: {}},
presetChalls: JSON.parse(localStorage.getItem("presetChalls") || "[]"),
tchallDiag: "",
curChallToAccept: {from: {}},
presetChalls: JSON.parse(localStorage.getItem("presetChalls") || "[]"),
@@
-255,8
+257,7
@@
export default {
connexionString: "",
socketCloseListener: 0,
// Related to (killing of) self multi-connects:
connexionString: "",
socketCloseListener: 0,
// Related to (killing of) self multi-connects:
- newConnect: {},
- killed: {}
+ newConnect: {}
};
},
watch: {
};
},
watch: {
@@
-275,6
+276,8
@@
export default {
},
created: function() {
document.addEventListener('visibilitychange', this.visibilityChange);
},
created: function() {
document.addEventListener('visibilitychange', this.visibilityChange);
+ window.addEventListener('focus', this.onFocus);
+ window.addEventListener('blur', this.onBlur);
window.addEventListener("beforeunload", this.cleanBeforeDestroy);
if (this.st.variants.length > 0 && this.newchallenge.vid > 0)
this.loadNewchallVariant();
window.addEventListener("beforeunload", this.cleanBeforeDestroy);
if (this.st.variants.length > 0 && this.newchallenge.vid > 0)
this.loadNewchallVariant();
@@
-319,7
+322,13
@@
export default {
);
},
mounted: function() {
);
},
mounted: function() {
- ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
+ document.getElementById("peopleWrap")
+ .addEventListener("click", (e) => {
+ processModalClick(e, () => {
+ this.toggleSocialColor("close")
+ });
+ });
+ ["infoDiv", "newgameDiv"].forEach(eltName => {
document.getElementById(eltName)
.addEventListener("click", processModalClick);
});
document.getElementById(eltName)
.addEventListener("click", processModalClick);
});
@@
-408,6
+417,8
@@
export default {
cleanBeforeDestroy: function() {
clearInterval(this.socketCloseListener);
document.removeEventListener('visibilitychange', this.visibilityChange);
cleanBeforeDestroy: function() {
clearInterval(this.socketCloseListener);
document.removeEventListener('visibilitychange', this.visibilityChange);
+ window.removeEventListener('focus', this.onFocus);
+ window.removeEventListener('blur', this.onBlur);
window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
this.conn.removeEventListener("message", this.socketMessageListener);
this.send("disconnect");
window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
this.conn.removeEventListener("message", this.socketMessageListener);
this.send("disconnect");
@@
-418,10
+429,6
@@
export default {
["random-" + pc.randomness]: true
};
},
["random-" + pc.randomness]: true
};
},
- openModalPeople: function() {
- window.doClick("modalPeople");
- document.getElementById("inputChat").focus();
- },
anonymousCount: function() {
let count = 0;
Object.values(this.people).forEach(p => {
anonymousCount: function() {
let count = 0;
Object.values(this.people).forEach(p => {
@@
-432,11
+439,16
@@
export default {
},
visibilityChange: function() {
// TODO: Use document.hidden? https://webplatform.news/issues/2019-03-27
},
visibilityChange: function() {
// TODO: Use document.hidden? https://webplatform.news/issues/2019-03-27
- this.send(
- document.visibilityState == "visible"
- ? "getfocus"
- : "losefocus"
- );
+ this.focus = (document.visibilityState == "visible");
+ this.send(this.focus ? "getfocus" : "losefocus");
+ },
+ onFocus: function() {
+ this.focus = true;
+ this.send("getfocus");
+ },
+ onBlur: function() {
+ this.focus = false;
+ this.send("losefocus");
},
partialResetNewchallenge: function() {
// Reset potential target and custom FEN:
},
partialResetNewchallenge: function() {
// Reset potential target and custom FEN:
@@
-470,7
+482,8
@@
export default {
},
removePresetChall: function(e, pchall) {
e.stopPropagation();
},
removePresetChall: function(e, pchall) {
e.stopPropagation();
- const pchallIdx = this.presetChalls.findIndex(pc => pc.index == pchall.index);
+ const pchallIdx =
+ this.presetChalls.findIndex(pc => pc.index == pchall.index);
this.presetChalls.splice(pchallIdx, 1);
localStorage.setItem("presetChalls", JSON.stringify(this.presetChalls));
},
this.presetChalls.splice(pchallIdx, 1);
localStorage.setItem("presetChalls", JSON.stringify(this.presetChalls));
},
@@
-490,7
+503,7
@@
export default {
document.getElementById("cadence").focus();
},
send: function(code, obj) {
document.getElementById("cadence").focus();
},
send: function(code, obj) {
- if (!!this.conn) {
+ if (!!this.conn
&& this.conn.readyState == 1
) {
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
}
},
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
}
},
@@
-505,8
+518,10
@@
export default {
filterGames: function(type) {
return this.games.filter(g => g.type == type);
},
filterGames: function(type) {
return this.games.filter(g => g.type == type);
},
+ // o: challenge or game
classifyObject: function(o) {
classifyObject: function(o) {
- // o: challenge or game
+ // Consider imports as live games (TODO)
+ if (!!o.id && !!o.id.toString().match(/^i/)) return "live";
return o.cadence.indexOf("d") === -1 ? "live" : "corr";
},
setDisplay: function(letter, type, e) {
return o.cadence.indexOf("d") === -1 ? "live" : "corr";
},
setDisplay: function(letter, type, e) {
@@
-533,7
+548,8
@@
export default {
// This is meant to challenge people, thus the next 2 conditions:
this.st.user.id > 0 &&
sid != this.st.user.sid &&
// This is meant to challenge people, thus the next 2 conditions:
this.st.user.id > 0 &&
sid != this.st.user.sid &&
- Object.values(this.people[sid].tmpIds).some(v => v.focus && v.page == "/")
+ Object.values(this.people[sid].tmpIds)
+ .some(v => v.focus && v.page == "/")
);
},
challenge: function(sid) {
);
},
challenge: function(sid) {
@@
-563,9
+579,11
@@
export default {
// ==> Moves sent by connected remote player(s) if live game
this.$router.push("/game/" + g.id);
},
// ==> Moves sent by connected remote player(s) if live game
this.$router.push("/game/" + g.id);
},
- resetSocialColor: function() {
- // TODO: this is called twice, once on opening an once on closing
- document.getElementById("peopleBtn").classList.remove("somethingnew");
+ toggleSocialColor: function(action) {
+ if (!action && document.getElementById("modalPeople").checked)
+ document.getElementById("inputChat").focus();
+ else
+ document.getElementById("peopleBtn").classList.remove("somethingnew");
},
processChat: function(chat) {
this.send("newchat", { data: chat });
},
processChat: function(chat) {
this.send("newchat", { data: chat });
@@
-588,7
+606,6
@@
export default {
// TODO: shuffling and random filtering on server,
// if the room is really crowded.
Object.keys(data.sockIds).forEach(sid => {
// TODO: shuffling and random filtering on server,
// if the room is really crowded.
Object.keys(data.sockIds).forEach(sid => {
- // TODO: test sid != user.sid was already done on server
if (sid != this.st.user.sid) {
// Pick a target tmpId (+page) at random:
const pt = Object.values(data.sockIds[sid]);
if (sid != this.st.user.sid) {
// Pick a target tmpId (+page) at random:
const pt = Object.values(data.sockIds[sid]);
@@
-626,13
+643,13
@@
export default {
const page = data.page || "/";
if (data.code == "connect") {
// Ask challenges only on first connexion:
const page = data.page || "/";
if (data.code == "connect") {
// Ask challenges only on first connexion:
- if (!this.people[data.from])
+ if (!this.people[data.from
[0]
])
this.send("askchallenges", { target: data.from[0] });
}
// Ask game only if live:
else if (!page.match(/\/[0-9]+$/))
this.send("askgame", { target: data.from[0], page: page });
this.send("askchallenges", { target: data.from[0] });
}
// Ask game only if live:
else if (!page.match(/\/[0-9]+$/))
this.send("askgame", { target: data.from[0], page: page });
- if (!this.people[data.from]) {
+ if (!this.people[data.from
[0]
]) {
this.$set(
this.people,
data.from[0],
this.$set(
this.people,
data.from[0],
@@
-642,7
+659,8
@@
export default {
}
}
);
}
}
);
- this.newConnect[data.from] = true; //for self multi-connects tests
+ // For self multi-connects tests:
+ this.newConnect[data.from[0]] = true;
this.send("askidentity", { target: data.from[0], page: page });
} else {
this.people[data.from[0]].tmpIds[data.from[1]] =
this.send("askidentity", { target: data.from[0], page: page });
} else {
this.people[data.from[0]].tmpIds[data.from[1]] =
@@
-653,8
+671,9
@@
export default {
}
case "disconnect":
case "gdisconnect": {
}
case "disconnect":
case "gdisconnect": {
- // If the user reloads the page twice very quickly (experienced with Firefox),
- // the first reload won't have time to connect but will trigger a "close" event anyway.
+ // If the user reloads the page twice very quickly
+ // (experienced with Firefox), the first reload won't have time to
+ // connect but will trigger a "close" event anyway.
// ==> Next check is required.
if (!this.people[data.from[0]]) return;
delete this.people[data.from[0]].tmpIds[data.from[1]];
// ==> Next check is required.
if (!this.people[data.from[0]]) return;
delete this.people[data.from[0]].tmpIds[data.from[1]];
@@
-673,7
+692,7
@@
export default {
const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
// Corr games are always reachable:
if (!gid.match(/^[0-9]+$/)) {
const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
// Corr games are always reachable:
if (!gid.match(/^[0-9]+$/)) {
- // Live games are reachable
as long as
someone is on the game page
+ // Live games are reachable
if
someone is on the game page
if (Object.values(this.people).every(p =>
Object.values(p.tmpIds).every(v => v.page != data.page))
) {
if (Object.values(this.people).every(p =>
Object.values(p.tmpIds).every(v => v.page != data.page))
) {
@@
-700,13
+719,6
@@
export default {
}
break;
}
}
break;
}
- case "killed":
- // I logged in elsewhere:
- this.conn.removeEventListener("message", this.socketMessageListener);
- this.conn.removeEventListener("close", this.socketCloseListener);
- this.conn = null;
- alert(this.st.tr["New connexion detected: tab now offline"]);
- break;
case "askidentity": {
// Request for identification
const me = {
case "askidentity": {
// Request for identification
const me = {
@@
-729,16
+741,16
@@
export default {
this.$forceUpdate();
// If I multi-connect, kill current connexion if no mark (I'm older)
if (this.newConnect[user.sid]) {
this.$forceUpdate();
// If I multi-connect, kill current connexion if no mark (I'm older)
if (this.newConnect[user.sid]) {
+ delete this.newConnect[user.sid];
if (
user.id > 0 &&
user.id == this.st.user.id &&
if (
user.id > 0 &&
user.id == this.st.user.id &&
- user.sid != this.st.user.sid &&
- !this.killed[this.st.user.sid]
+ user.sid != this.st.user.sid
) {
) {
- this.send("killme", { sid: this.st.user.sid });
- this.killed[this.st.user.sid] = true;
+ // I logged in elsewhere:
+ this.cleanBeforeDestroy();
+ alert(this.st.tr["New connexion detected: tab now offline"]);
}
}
- delete this.newConnect[user.sid];
}
break;
}
}
break;
}
@@
-749,9
+761,9
@@
export default {
c.from.sid == this.st.user.sid && c.type == "live"
)
.map(c => {
c.from.sid == this.st.user.sid && c.type == "live"
)
.map(c => {
- // NOTE: in principle, should only send targeted challenge to the
target.
- //
But we may not know yet the identity of the target (just name),
- //
so cannot decide if data.from is the target or no
t.
+ // NOTE: in principle, should only send targeted challenge to the
+ //
target. But we may not know yet the identity of the target
+ //
(just name), so can't decide if data.from is the targe
t.
return {
id: c.id,
from: this.st.user.sid,
return {
id: c.id,
from: this.st.user.sid,
@@
-782,7
+794,8
@@
export default {
case "deletechallenge_s": {
// NOTE: the challenge(s) may be already removed
const cref = data.data;
case "deletechallenge_s": {
// NOTE: the challenge(s) may be already removed
const cref = data.data;
- if (!!cref.cid) ArrayFun.remove(this.challenges, c => c.id == cref.cid);
+ if (!!cref.cid)
+ ArrayFun.remove(this.challenges, c => c.id == cref.cid);
else if (!!cref.sids) {
cref.sids.forEach(s => {
ArrayFun.remove(
else if (!!cref.sids) {
cref.sids.forEach(s => {
ArrayFun.remove(
@@
-913,6
+926,15
@@
export default {
.getElementById("btnC" + newChall.type)
.classList.add("somethingnew");
}
.getElementById("btnC" + newChall.type)
.classList.add("somethingnew");
}
+ if (!!chall.to) {
+ notify(
+ "New challenge",
+ // fromValues.name should exist since the player is online, but
+ // let's consider there is some chance that the challenge arrives
+ // right after we connected and before receiving the poll result:
+ { body: "from " + (fromValues.name || "unknown yet...") }
+ );
+ }
}
},
loadNewchallVariant: async function(cb) {
}
},
loadNewchallVariant: async function(cb) {
@@
-1040,7
+1062,7
@@
export default {
name: this.st.user.name
};
chall.added = Date.now();
name: this.st.user.name
};
chall.added = Date.now();
- // NOTE: vname and type are redundant (
can be
deduced from cadence + vid)
+ // NOTE: vname and type are redundant (deduced from cadence + vid)
chall.type = ctype;
chall.vname = this.newchallenge.vname;
this.challenges.push(chall);
chall.type = ctype;
chall.vname = this.newchallenge.vname;
this.challenges.push(chall);
@@
-1089,9
+1111,13
@@
export default {
name: this.st.user.name
};
this.launchGame(c);
name: this.st.user.name
};
this.launchGame(c);
- if (c.type == "live")
+ if (c.type == "live")
{
// Remove all live challenges of both players
// Remove all live challenges of both players
- this.send("deletechallenge_s", { data: { sids: [c.from.sid, c.seat.sid] } });
+ this.send(
+ "deletechallenge_s",
+ { data: { sids: [c.from.sid, c.seat.sid] } }
+ );
+ }
else
// Corr challenge: just remove the challenge
this.send("deletechallenge_s", { data: { cid: c.id } });
else
// Corr challenge: just remove the challenge
this.send("deletechallenge_s", { data: { cid: c.id } });
@@
-1231,11
+1257,13
@@
export default {
// Game state (including FEN): will be updated
moves: [],
clocks: [-1, -1], //-1 = unstarted
// Game state (including FEN): will be updated
moves: [],
clocks: [-1, -1], //-1 = unstarted
+ chats: [],
score: "*"
}
);
setTimeout(
() => {
score: "*"
}
);
setTimeout(
() => {
+ const myIdx = (game.players[0].sid == this.st.user.sid ? 0 : 1);
GameStorage.add(game, (err) => {
// If an error occurred, game is not added: a tab already
// added the game. Maybe a focused one, maybe not.
GameStorage.add(game, (err) => {
// If an error occurred, game is not added: a tab already
// added the game. Maybe a focused one, maybe not.
@@
-1243,10
+1271,16
@@
export default {
// ==> Do not play it again.
if (!err && this.st.settings.sound)
new Audio("/sounds/newgame.flac").play().catch(() => {});
// ==> Do not play it again.
if (!err && this.st.settings.sound)
new Audio("/sounds/newgame.flac").play().catch(() => {});
+ if (!this.focus) {
+ notify(
+ "New live game",
+ { body: "vs " + game.players[1-myIdx].name || "@nonymous" }
+ );
+ }
this.$router.push("/game/" + gameInfo.id);
});
},
this.$router.push("/game/" + gameInfo.id);
});
},
-
document.hidden
? 500 + 1000 * Math.random() : 0
+
this.focus
? 500 + 1000 * Math.random() : 0
);
}
}
);
}
}