trivabble/trivabble
trivabble
/
trivabble
2
1
Fork 1
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Merge branch 'fix_eslint_erros_from_timer' into 'develop' 

Fix eslint errors from timer branch

See merge request raphj/trivabble!24
This commit is contained in:
Raphaël Jakse 2021-01-20 18:33:20 +00:00
parent 2bcac05534 6cee6fbf91
commit 1410b41216
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/trivabble.js
View File

@ -102,7 +102,7 @@
} else {
console.error("Unsupported type");
}
} else if (defaultValue !== undefined) {
} else if (typeof defaultValue !== "undefined") {
return defaultValue;
}
@ -165,7 +165,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;
@ -2268,7 +2271,7 @@
setTimerState(getSetting("TimerEnable", getSetting("ENABLE_TIMER")));
}
let timerTimeout = 0
let timerTimeout = 0;
function updateTimer() {
const currentTimer = timerDate();
@ -2280,7 +2283,7 @@
setSetting("TimerEnable", enabled);
if (timerTimeout) {
clearInterval(timerTimeout);
timerTimeout = 0
timerTimeout = 0;
}
if (enabled) {