projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes
[vchess.git]
/
client
/
src
/
views
/
Hall.vue
diff --git
a/client/src/views/Hall.vue
b/client/src/views/Hall.vue
index
a39cd54
..
5ceb7e3
100644
(file)
--- a/
client/src/views/Hall.vue
+++ b/
client/src/views/Hall.vue
@@
-19,7
+19,10
@@
main
.button-group#buttonsTchall
button.acceptBtn(@click="decisionChallenge(true)") {{ st.tr["Accept challenge?"] }}
button.refuseBtn(@click="decisionChallenge(false)") {{ st.tr["Refuse"] }}
.button-group#buttonsTchall
button.acceptBtn(@click="decisionChallenge(true)") {{ st.tr["Accept challenge?"] }}
button.refuseBtn(@click="decisionChallenge(false)") {{ st.tr["Refuse"] }}
- input#modalNewgame.modal(type="checkbox")
+ input#modalNewgame.modal(
+ type="checkbox"
+ @change="cadenceFocusIfOpened($event)"
+ )
div#newgameDiv(
role="dialog"
data-checkbox="modalNewgame"
div#newgameDiv(
role="dialog"
data-checkbox="modalNewgame"
@@
-42,9
+45,10
@@
main
fieldset
label(for="cadence") {{ st.tr["Cadence"] }} *
div#predefinedCadences
fieldset
label(for="cadence") {{ st.tr["Cadence"] }} *
div#predefinedCadences
- button(type="button") 3+2
button(type="button") 5+3
button(type="button") 15+5
button(type="button") 5+3
button(type="button") 15+5
+ button(type="button") 45+30
+ button(type="button") 7d+2d
input#cadence(
type="text"
v-model="newchallenge.cadence"
input#cadence(
type="text"
v-model="newchallenge.cadence"
@@
-237,7
+241,6
@@
export default {
let names = {};
response.challenges.forEach(c => {
if (c.uid != this.st.user.id) names[c.uid] = "";
let names = {};
response.challenges.forEach(c => {
if (c.uid != this.st.user.id) names[c.uid] = "";
- //unknwon for now
else if (!!c.target && c.target != this.st.user.id)
names[c.target] = "";
});
else if (!!c.target && c.target != this.st.user.id)
names[c.target] = "";
});
@@
-316,6
+319,10
@@
export default {
},
methods: {
// Helpers:
},
methods: {
// Helpers:
+ cadenceFocusIfOpened: function() {
+ if (event.target.checked)
+ document.getElementById("cadence").focus();
+ },
send: function(code, obj) {
if (this.conn) {
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
send: function(code, obj) {
if (this.conn) {
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
@@
-479,12
+486,12
@@
export default {
}
case "killed":
// I logged in elsewhere:
}
case "killed":
// I logged in elsewhere:
- alert(this.st.tr["New connexion detected: tab now offline"]);
// TODO: this fails. See https://github.com/websockets/ws/issues/489
//this.conn.removeEventListener("message", this.socketMessageListener);
//this.conn.removeEventListener("close", this.socketCloseListener);
//this.conn.close();
this.conn = null;
// TODO: this fails. See https://github.com/websockets/ws/issues/489
//this.conn.removeEventListener("message", this.socketMessageListener);
//this.conn.removeEventListener("close", this.socketCloseListener);
//this.conn.close();
this.conn = null;
+ alert(this.st.tr["New connexion detected: tab now offline"]);
break;
case "askidentity": {
// Request for identification (TODO: anonymous shouldn't need to reply)
break;
case "askidentity": {
// Request for identification (TODO: anonymous shouldn't need to reply)
@@
-751,6
+758,13
@@
export default {
localStorage.setItem("cadence", chall.cadence);
localStorage.setItem("vid", chall.vid);
document.getElementById("modalNewgame").checked = false;
localStorage.setItem("cadence", chall.cadence);
localStorage.setItem("vid", chall.vid);
document.getElementById("modalNewgame").checked = false;
+ // Show the challenge if not on current display
+ if (
+ (ctype == "live" && this.cdisplay == "corr") ||
+ (ctype == "corr" && this.cdisplay == "live")
+ ) {
+ this.setDisplay('c', ctype);
+ }
};
if (ctype == "live") {
// Live challenges have a random ID
};
if (ctype == "live") {
// Live challenges have a random ID
@@
-799,9
+813,10
@@
export default {
// c.to == this.st.user.name (connected)
if (c.fen) {
const parsedFen = V.ParseFen(c.fen);
// c.to == this.st.user.name (connected)
if (c.fen) {
const parsedFen = V.ParseFen(c.fen);
+ c.mycolor = V.GetOppCol(parsedFen.turn);
this.tchallDiag = getDiagram({
position: parsedFen.position,
this.tchallDiag = getDiagram({
position: parsedFen.position,
- orientation:
V.GetOppCol(parsedFen.turn)
+ orientation:
c.mycolor
});
this.curChallToAccept = c;
document.getElementById("modalAccept").checked = true;
});
this.curChallToAccept = c;
document.getElementById("modalAccept").checked = true;
@@
-831,7
+846,10
@@
export default {
let gameInfo = {
id: getRandString(),
fen: c.fen || V.GenRandInitFen(),
let gameInfo = {
id: getRandString(),
fen: c.fen || V.GenRandInitFen(),
- players: shuffle([c.from, c.seat]), //white then black
+ // White player index 0, black player index 1:
+ players: c.mycolor
+ ? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat])
+ : shuffle([c.from, c.seat]),
vid: c.vid,
cadence: c.cadence
};
vid: c.vid,
cadence: c.cadence
};
@@
-881,8
+899,8
@@
export default {
GameStorage.add(game, (err) => {
// If an error occurred, game is not added: abort
if (!err) {
GameStorage.add(game, (err) => {
// If an error occurred, game is not added: abort
if (!err) {
- if (this.st.settings.sound
>= 1
)
- new Audio("/sounds/newgame.
mp3
").play().catch(() => {});
+ if (this.st.settings.sound)
+ new Audio("/sounds/newgame.
wav
").play().catch(() => {});
this.$router.push("/game/" + gameInfo.id);
}
});
this.$router.push("/game/" + gameInfo.id);
}
});