Index: binaries/data/mods/public/gui/common/functions_utility.js =================================================================== --- binaries/data/mods/public/gui/common/functions_utility.js +++ binaries/data/mods/public/gui/common/functions_utility.js @@ -36,15 +36,14 @@ // A sorting function for arrays of objects with 'name' properties, ignoring case function sortNameIgnoreCase(x, y) { - var lowerX = x.name.toLowerCase(); - var lowerY = y.name.toLowerCase(); + let lowerX = x.name.toLowerCase(); + let lowerY = y.name.toLowerCase(); if (lowerX < lowerY) return -1; - else if (lowerX > lowerY) + if (lowerX > lowerY) return 1; - else - return 0; + return 0; } /** Index: binaries/data/mods/public/gui/common/functions_utility_loadsave.js =================================================================== --- binaries/data/mods/public/gui/common/functions_utility_loadsave.js +++ binaries/data/mods/public/gui/common/functions_utility_loadsave.js @@ -102,14 +102,14 @@ function deleteTooltip() { - let deleteTooltip = colorizeHotkey( + let tooltip = colorizeHotkey( translate("Delete the selected entry using %(hotkey)s."), "session.savedgames.delete"); - if (deleteTooltip) - deleteTooltip += colorizeHotkey( - "\n" + translate("Hold %(hotkey)s to delete without confirmation."), + if (tooltip) + tooltip += colorizeHotkey( + "\n" + translate("Hold %(hotkey)s to delete without confirmation."), "session.savedgames.noconfirmation"); - return deleteTooltip; + return tooltip; } Index: binaries/data/mods/public/gui/common/music.js =================================================================== --- binaries/data/mods/public/gui/common/music.js +++ binaries/data/mods/public/gui/common/music.js @@ -110,7 +110,7 @@ this.resetTracks(); for (var music of civMusic) { - var type = undefined; + let type; for (var i in this.MUSIC) { if (music.Type == this.MUSIC[i]) Index: binaries/data/mods/public/gui/common/settings.js =================================================================== --- binaries/data/mods/public/gui/common/settings.js +++ binaries/data/mods/public/gui/common/settings.js @@ -352,7 +352,7 @@ */ function translateMapSize(tiles) { - var mapSize = g_Settings.MapSizes.find(mapSize => mapSize.Tiles == +tiles); + let mapSize = g_Settings.MapSizes.find(size => size.Tiles == +tiles); return mapSize ? mapSize.Name : translateWithContext("map size", "Default"); } @@ -376,6 +376,6 @@ */ function translateVictoryCondition(gameType) { - var vc = g_Settings.VictoryConditions.find(vc => vc.Name == gameType); - return vc ? vc.Title : translateWithContext("victory condition", "Unknown"); + let victoryCondition = g_Settings.VictoryConditions.find(vc => vc.Name == gameType); + return victoryCondition ? victoryCondition.Title : translateWithContext("victory condition", "Unknown"); } Index: binaries/data/mods/public/gui/common/timer.js =================================================================== --- binaries/data/mods/public/gui/common/timer.js +++ binaries/data/mods/public/gui/common/timer.js @@ -47,14 +47,14 @@ // (We do this in two stages to avoid deleting from the timer list while // we're in the middle of iterating through it) var run = []; - for (var id in g_Timers) + for (let id in g_Timers) { if (g_Timers[id][0] <= g_Time) run.push(id); } - for (var id of run) + for (let id of run) { - var t = g_Timers[id]; + let t = g_Timers[id]; if (!t) continue; // an earlier timer might have cancelled this one, so skip it Index: binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js =================================================================== --- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js +++ binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js @@ -233,16 +233,13 @@ g_IsRejoining = true; return; // we'll process the game setup messages in the next tick } - else - { - Engine.SwitchGuiPage("page_gamesetup.xml", { - "type": g_GameType, - "serverName": g_ServerName, - "serverPort": g_ServerPort, - "stunEndpoint": g_StunEndpoint - }); - return; // don't process any more messages - leave them for the game GUI loop - } + Engine.SwitchGuiPage("page_gamesetup.xml", { + "type": g_GameType, + "serverName": g_ServerName, + "serverPort": g_ServerPort, + "stunEndpoint": g_StunEndpoint + }); + return; // don't process any more messages - leave them for the game GUI loop case "disconnected": cancelSetup(); Index: binaries/data/mods/public/gui/locale/locale_advanced.js =================================================================== --- binaries/data/mods/public/gui/locale/locale_advanced.js +++ binaries/data/mods/public/gui/locale/locale_advanced.js @@ -9,9 +9,9 @@ var languageListData = []; var languageListTmp = Engine.GetSupportedLocaleBaseNames(); var currentLocaleLanguage = Engine.GetLocaleLanguage(initData.locale); - for (var i=0; i translate(mapName))); + mapNameFilter.list = [translateWithContext("map name", "Any")].concat(g_MapNames.map(name => translate(name))); mapNameFilter.list_data = [""].concat(g_MapNames); if (mapName) @@ -152,7 +152,7 @@ function initVictoryConditionFilter(victoryCondition) { let victoryConditionFilter = Engine.GetGUIObjectByName("victoryConditionFilter"); - victoryConditionFilter.list = [translateWithContext("victory condition", "Any gametype")].concat(g_VictoryConditions.map(victoryCondition => translateVictoryCondition(victoryCondition))); + victoryConditionFilter.list = [translateWithContext("victory condition", "Any gametype")].concat(g_VictoryConditions.map(vc => translateVictoryCondition(vc))); victoryConditionFilter.list_data = [""].concat(g_VictoryConditions); if (victoryCondition) Index: binaries/data/mods/public/gui/structree/draw.js =================================================================== --- binaries/data/mods/public/gui/structree/draw.js +++ binaries/data/mods/public/gui/structree/draw.js @@ -336,8 +336,8 @@ } // Hide unused struct rows - for (let j = phaseCount - i; j < phaseCount; ++j) - Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_row["+j+"]").hidden = true; + for (let k = phaseCount - i; k < phaseCount; ++k) + Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_row["+k+"]").hidden = true; let size = ele.size; size.bottom += Object.keys(g_DrawLimits[pha].prodQuant).length*24; Index: binaries/data/mods/public/gui/structree/helper.js =================================================================== --- binaries/data/mods/public/gui/structree/helper.js +++ binaries/data/mods/public/gui/structree/helper.js @@ -93,7 +93,7 @@ upgrade.entity = upgrade.entity.replace("{civ}", g_SelectedCiv); let data = GetTemplateDataHelper(loadTemplate(upgrade.entity), null, g_AuraData, g_ResourceData); - data.cost = upgrade.cost + data.cost = upgrade.cost; data.icon = upgrade.icon || data.icon; data.tooltip = upgrade.tooltip || data.tooltip; data.requiredTechnology = upgrade.requiredTechnology || data.requiredTechnology; Index: binaries/data/mods/public/gui/summary/summary.js =================================================================== --- binaries/data/mods/public/gui/summary/summary.js +++ binaries/data/mods/public/gui/summary/summary.js @@ -14,7 +14,7 @@ "green": "201 255 200", "red": "255 213 213", "yellow": "255 255 157" -} +}; /** * Colors, captions and format used for units, buildings, etc. types @@ -146,7 +146,10 @@ ); } - [0, 1].forEach(i => Engine.GetGUIObjectByName("chart[" + i + "]").series_color = player_colors); + [0, 1].forEach(i => + { + Engine.GetGUIObjectByName("chart[" + i + "]").series_color = player_colors; + }); let chartLegend = Engine.GetGUIObjectByName("chartLegend"); chartLegend.caption = g_GameData.sim.playerStates.slice(1).map( @@ -412,7 +415,7 @@ "time": timeToString(g_GameData.sim.timeElapsed) }); - let mapType = g_Settings.MapTypes.find(mapType => mapType.Name == g_GameData.sim.mapSettings.mapType); + let mapType = g_Settings.MapTypes.find(type => type.Name == g_GameData.sim.mapSettings.mapType); let mapSize = g_Settings.MapSizes.find(size => size.Tiles == g_GameData.sim.mapSettings.Size || 0); Engine.GetGUIObjectByName("mapName").caption = sprintf(