X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=app.js;h=a46ceb39d5ca33499d6814ef7503844d1b44d28f;hb=55a15dcb7df5091f46f7dd9c170b2aae5846c6c0;hp=56ba25a02854c2f60d3014372d730ebd8c5cfbe5;hpb=86f3c2cd59432a00121af015c505499a57edf568;p=xogo.git
diff --git a/app.js b/app.js
index 56ba25a..a46ceb3 100644
--- a/app.js
+++ b/app.js
@@ -59,10 +59,19 @@ function toggleVisible(element) {
if (elt.id != element) elt.style.display = "none";
else elt.style.display = "block";
}
- if (element.id == "newGame") {
- // Workaround "superposed texts" effect
- inputName.focus();
- inputName.blur();
+ if (element == "boardContainer") {
+ // Avoid smartphone scrolling effects (TODO?)
+ document.querySelector("html").style.overflow = "hidden";
+ document.body.style.overflow = "hidden";
+ }
+ else {
+ document.querySelector("html").style.overflow = "visible";
+ document.body.style.overflow = "visible";
+ if (element == "newGame") {
+ // Workaround "superposed texts" effect
+ inputName.focus();
+ inputName.blur();
+ }
}
}
@@ -95,8 +104,8 @@ function showNewGameForm() {
$.getElementById("selectColor").selectedIndex = 0;
toggleVisible("newGameForm");
import(`/variants/${vname}/class.js`).then(module => {
- const Rules = module.default;
- prepareOptions(Rules);
+ window.V = module.default;
+ prepareOptions();
});
}
}
@@ -108,9 +117,9 @@ function toggleStyle(e, word) {
}
let options;
-function prepareOptions(Rules) {
+function prepareOptions() {
options = {};
- let optHtml = Rules.Options.select.map(select => { return `
+ let optHtml = V.Options.select.map(select => { return `
@@ -128,7 +137,7 @@ function prepareOptions(Rules) {
`;
}).join("");
- optHtml += Rules.Options.check.map(check => {
+ optHtml += V.Options.check.map(check => {
return `
`;
}).join("");
- if (Rules.Options.styles.length >= 1) {
+ if (V.Options.styles.length >= 1) {
optHtml += '';
let i = 0;
- const stylesLength = Rules.Options.styles.length;
+ const stylesLength = V.Options.styles.length;
while (i < stylesLength) {
optHtml += '
';
for (let j=i; j
${style}`;
}
@@ -165,10 +174,11 @@ function getGameLink() {
for (const select of $.querySelectorAll("#gameOptions select")) {
let value = select.value;
if (select.attributes["data-numeric"]) value = parseInt(value, 10);
- options[ select.id.split("_")[1] ] = value;
+ if (value) options[ select.id.split("_")[1] ] = value;
+ }
+ for (const check of $.querySelectorAll("#gameOptions input")) {
+ if (check.checked) options[ check.id.split("_")[1] ] = check.checked;
}
- for (const check of $.querySelectorAll("#gameOptions input"))
- options[ check.id.split("_")[1] ] = check.checked;
send("creategame", {
vname: vname,
player: { sid: sid, name: localStorage.getItem("name"), color: color },
@@ -253,7 +263,7 @@ const messageCenter = (msg) => {
switch (obj.code) {
// Start new game:
case "gamestart": {
- if (!$.hasFocus()) notifyMe("game");
+ if (document.hidden) notifyMe("game");
gid = obj.gid;
initializeGame(obj);
break;
@@ -285,7 +295,10 @@ const messageCenter = (msg) => {
break;
// Receive opponent's move:
case "newmove":
- if (!$.hasFocus()) notifyMe("move");
+ send("gotmove", {fen: obj.fen, gid: gid});
+ if (obj.fen == lastFen) break; //got this move already
+ lastFen = obj.fen;
+ if (document.hidden) notifyMe("move");
vr.playReceivedMove(obj.moves, () => {
if (vr.getCurrentScore(obj.moves[obj.moves.length-1]) != "*") {
localStorage.removeItem("gid");
@@ -294,6 +307,16 @@ const messageCenter = (msg) => {
else toggleTurnIndicator(true);
});
break;
+ // The server notifies that it got our move:
+ case "gotmove":
+ if (obj.fen == lastFen) {
+ curMoves = [];
+ clearTimeout(timeout1);
+ clearTimeout(timeout2);
+ clearTimeout(timeout3);
+ callbackAfterConfirmation();
+ }
+ break;
// Opponent stopped game (draw, abort, resign...)
case "gameover":
toggleVisible("gameStopped");
@@ -360,31 +383,45 @@ function notifyMe(code) {
}
if (Notification.permission === 'granted') doNotify();
else if (Notification.permission !== 'denied') {
- Notification.requestPermission().then((permission) => {
+ Notification.requestPermission().then(permission => {
if (permission === 'granted') doNotify();
});
}
}
-let curMoves = [];
-const afterPlay = (move) => { //pack into one moves array, then send
+let curMoves = [],
+ lastFen, lastMove,
+ timeout1, timeout2, timeout3;
+const callbackAfterConfirmation = () => {
+ const result = vr.getCurrentScore(lastMove);
+ if (result != "*") {
+ setTimeout( () => {
+ toggleVisible("gameStopped");
+ send("gameover", { gid: gid });
+ }, 2000);
+ }
+};
+const afterPlay = (move) => {
+ // Pack into one moves array, then send
curMoves.push({
appear: move.appear,
vanish: move.vanish,
start: move.start,
end: move.end
});
+ lastMove = move;
if (vr.turn != playerColor) {
toggleTurnIndicator(false);
- send("newmove", { gid: gid, moves: curMoves, fen: vr.getFen() });
- curMoves = [];
- const result = vr.getCurrentScore(move);
- if (result != "*") {
- setTimeout( () => {
- toggleVisible("gameStopped");
- send("gameover", { gid: gid });
- }, 2000);
- }
+ lastFen = vr.getFen();
+ const sendMove =
+ () => send("newmove", {gid: gid, moves: curMoves, fen: lastFen});
+ // Send move until we obtain confirmation or timeout, then callback
+ sendMove();
+ timeout1 = setTimeout(sendMove, 500);
+ timeout2 = setTimeout(sendMove, 1500);
+ timeout3 = setTimeout(
+ () => alert("The move may be lost :( Please reload"),
+ 3000);
}
};
@@ -404,21 +441,31 @@ let vr, playerColor;
function initializeGame(obj) {
const options = obj.options || {};
import(`/variants/${obj.vname}/class.js`).then(module => {
- const Rules = module.default;
+ window.V = module.default;
conditionalLoadCSS(obj.vname);
playerColor = (sid == obj.players[0].sid ? "w" : "b");
// Init + remove potential extra DOM elements from a previous game:
document.getElementById("boardContainer").innerHTML = `
-
+
-
+
`;
- vr = new Rules({
+ vr = new V({
seed: obj.seed, //may be null if FEN already exists (running game)
fen: obj.fen,
element: "chessboard",