Merge branch 'develop' into cell_caption_option

This commit is contained in:
Laurent Mazet 2021-04-21 10:45:03 +02:00
commit fa58416e05
2 changed files with 8 additions and 5 deletions

View File

@ -24,7 +24,7 @@ It supports:
It should work on any browser released after 2015, though we haven't tested it on Internet Explorer.
This documentation is intented for people who want to install Trivabble on their server.
If you just want to play, head to https://trivabble.1s.fr/.
If you just want to play, head to https://trivabble.org/.
For contributions, see (contributing)[CONTRIBUTING.md].

View File

@ -103,7 +103,7 @@
} else {
console.error("Unsupported type");
}
} else if (defaultValue !== undefined) {
} else if (typeof defaultValue !== "undefined") {
return defaultValue;
}
@ -170,7 +170,10 @@
const trivabble = window.trivabble = {l10n: _};
function format(s, v1, v2, v3) {
return s.replace("{0}", v1).replace("{1}", v2).replace("{2}", v3);
return s
.replace("{0}", v1)
.replace("{1}", v2)
.replace("{2}", v3);
}
let board;
@ -2281,7 +2284,7 @@
setTimerState(getSetting("ENABLE_TIMER"));
}
let timerTimeout = 0
let timerTimeout = 0;
function updateTimer() {
const currentTimer = timerDate();
@ -2293,7 +2296,7 @@
setSetting("ENABLE_TIMER", enabled);
if (timerTimeout) {
clearInterval(timerTimeout);
timerTimeout = 0
timerTimeout = 0;
}
if (enabled) {