projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing name when launching a game from Hall (TODO: understand why it fails somet...
[vchess.git]
/
client
/
src
/
views
/
Hall.vue
diff --git
a/client/src/views/Hall.vue
b/client/src/views/Hall.vue
index
d0012fc
..
04ac6b8
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"] }}
@@
-322,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);
});
@@
-423,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 => {
@@
-577,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 });
@@
-1178,10
+1182,13
@@
export default {
// NOTE: when launching game, the challenge is already being deleted
launchGame: function(c) {
// White player index 0, black player index 1:
// NOTE: when launching game, the challenge is already being deleted
launchGame: function(c) {
// White player index 0, black player index 1:
-
cons
t players =
+
le
t players =
!!c.mycolor
? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat])
: shuffle([c.from, c.seat]);
!!c.mycolor
? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat])
: shuffle([c.from, c.seat]);
+ players.forEach(p => {
+ if (!!p["tmpIds"]) delete p["tmpIds"];
+ });
// These game informations will be shared
let gameInfo = {
id: getRandString(),
// These game informations will be shared
let gameInfo = {
id: getRandString(),