From: Laurent Mazet Date: Wed, 6 May 2020 21:58:43 +0000 (+0200) Subject: fix some (not all) eslint errors X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=dd3aa59300325d4af9b5530f8e71476d88d2250f;p=trivabble.git fix some (not all) eslint errors --- diff --git a/public/trivabble.js b/public/trivabble.js index de853a9..d03ece0 100644 --- a/public/trivabble.js +++ b/public/trivabble.js @@ -257,12 +257,10 @@ } else if (moveCMD.to === "rack") { moveRack.rack[moveCMD.indexTo] = ""; sendCmds([moveRack, moveCMD]); + } else if (rackChanged) { + sendCmds([moveCMD, moveRack]); } else { - if (rackChanged) { - sendCmds([moveCMD, moveRack]); - } else { - sendCmds([moveCMD]); - } + sendCmds([moveCMD]); } } @@ -1527,19 +1525,19 @@ function createLangBoardSelect(langName) { - var newLangName = []; - for (const key in langName) { - newLangName.push({"key": key, "value": _(langName[key])}); + let newLangName = []; + for (const k in langName) { + newLangName.push({key: k, value: _(langName[k])}); } - newLangName = newLangName.sort((a, b) => (a.value > b.value) ? 1 : ((b.value > a.value) ? -1 : 0)); + newLangName = newLangName.sort((a, b) => ((a.value > b.value) ? 1 : ((b.value > a.value) ? -1 : 0))); const select = document.getElementById("board-lang"); - for (var i = select.options.length - 1; i >=0; i--) { + for (let i = select.options.length - 1; i >=0; i--) { select.remove(i); } - for (var i = 0; i < newLangName.length; i++) { + for (let i = 0; i < newLangName.length; i++) { select.add(new Option(newLangName[i].value, newLangName[i].key)); } diff --git a/server/trivabble-server.js b/server/trivabble-server.js index cc4144f..dc769a8 100644 --- a/server/trivabble-server.js +++ b/server/trivabble-server.js @@ -58,13 +58,13 @@ const REQUEST_TYPE_WEBSOCKET = 3; /* eslint-disable quote-props */ /* Manage multi language board */ -var boardPieces = {}; -var langName = {}; -var langFiles = fs.readdirSync("./lang"); - for (var i in langFiles) { - const data = require("./lang/" + langFiles[i]); - boardPieces[data.code] = data; - langName[data.code] = data.name; +const boardPieces = {}; +const langName = {}; +const langFiles = fs.readdirSync("./lang"); +for (const i in langFiles) { + const data = require("./lang/" + langFiles[i]); + boardPieces[data.code] = data; + langName[data.code] = data.name; } const defaultLang = "fr";