From dc04f3f432646b9ad0b2901e98e2bf483ecaadcd Mon Sep 17 00:00:00 2001 From: Stan Date: Thu, 26 Jun 2025 10:37:24 +0200 Subject: [PATCH] Fix autofixable eslint warnings for eqeqeq Ref: #7812 Pull Request: #8129 --- binaries/data/mods/mod/gui/common/l10n.js | 2 +- binaries/data/mods/mod/gui/modmod/validatemod.js | 2 +- binaries/data/mods/public/globalscripts/utility.js | 2 +- binaries/data/mods/public/gui/common/gamedescription.js | 2 +- binaries/data/mods/public/gui/session/messages.js | 4 ++-- binaries/data/mods/public/gui/summary/counters.js | 4 ++-- binaries/data/mods/public/gui/summary/summary.js | 2 +- binaries/data/mods/public/maps/random/rmbiome/randombiome.js | 2 +- binaries/data/mods/public/maps/random/rmgen/RandomMap.js | 2 +- binaries/data/mods/public/maps/random/rmgen/library.js | 2 +- binaries/data/mods/public/maps/random/wild_lake.js | 2 +- binaries/data/mods/public/maps/scripts/Tutorial.js | 4 ++-- .../mods/public/simulation/ai/common-api/entitycollection.js | 2 +- .../data/mods/public/simulation/components/AIInterface.js | 2 +- .../mods/public/simulation/components/StatisticsTracker.js | 4 ++-- binaries/data/tests/test_setup.js | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/binaries/data/mods/mod/gui/common/l10n.js b/binaries/data/mods/mod/gui/common/l10n.js index 20e2cb4eab..ff05a094b0 100644 --- a/binaries/data/mods/mod/gui/common/l10n.js +++ b/binaries/data/mods/mod/gui/common/l10n.js @@ -57,7 +57,7 @@ var g_PluralTranslationsWithContext = {}; function isTranslatableString(message) { - return typeof message == "string" && !!message.trim(); + return typeof message === "string" && !!message.trim(); } /** diff --git a/binaries/data/mods/mod/gui/modmod/validatemod.js b/binaries/data/mods/mod/gui/modmod/validatemod.js index e74307f8e3..78f0fce210 100644 --- a/binaries/data/mods/mod/gui/modmod/validatemod.js +++ b/binaries/data/mods/mod/gui/modmod/validatemod.js @@ -88,7 +88,7 @@ function validateMod(folder, modData, notify) valid = false; } - if (typeof modData[propertyName] != property.type) + if (typeof modData[propertyName] !== property.type) { if (notify) warn(propertyName + " in mod '" + folder + "' is not of the type '" + property.type + "'!"); diff --git a/binaries/data/mods/public/globalscripts/utility.js b/binaries/data/mods/public/globalscripts/utility.js index 7ce4776288..6ecee8b6fd 100644 --- a/binaries/data/mods/public/globalscripts/utility.js +++ b/binaries/data/mods/public/globalscripts/utility.js @@ -75,7 +75,7 @@ function deepCompare(first, second) // check what type one of the objects is, and then compare them. // Check numbers seperately. Make sure this works with NaN, Infinity etc. - if (typeof first == "number") + if (typeof first === "number") return uneval(first) === uneval(second); // Functions and RegExps must have the same reference to be equal. diff --git a/binaries/data/mods/public/gui/common/gamedescription.js b/binaries/data/mods/public/gui/common/gamedescription.js index 5adc823c56..664261a5a6 100644 --- a/binaries/data/mods/public/gui/common/gamedescription.js +++ b/binaries/data/mods/public/gui/common/gamedescription.js @@ -121,7 +121,7 @@ function formatPlayerInfo(playerDataArray, playerStates) coloredText( (g_Buddies.indexOf(playerNick) != -1 ? g_BuddySymbol + " " : "") + escapeText(playerData.Name), - (typeof getPlayerColor == 'function' ? + (typeof getPlayerColor === 'function' ? (isAI ? "white" : getPlayerColor(playerNick)) : rgbToGuiColor(playerData.Color || g_Settings.PlayerDefaults[playerIdx].Color))), diff --git a/binaries/data/mods/public/gui/session/messages.js b/binaries/data/mods/public/gui/session/messages.js index 8e17f5519b..de287260de 100644 --- a/binaries/data/mods/public/gui/session/messages.js +++ b/binaries/data/mods/public/gui/session/messages.js @@ -378,7 +378,7 @@ function updateTutorial(notification) const notificationText = notification.instructions.reduce((instructions, item) => - instructions + (typeof item == "string" ? translate(item) : colorizeHotkey(translate(item.text), item.hotkey)), + instructions + (typeof item === "string" ? translate(item) : colorizeHotkey(translate(item.text), item.hotkey)), ""); Engine.GetGUIObjectByName("tutorialText").caption = g_TutorialMessages.concat(setStringTags(notificationText, g_TutorialNewMessageTags)).join("\n"); @@ -601,7 +601,7 @@ function openDialog(dialogName, data, player) for (const key in data[objName]) { const n = data[objName][key]; - if (typeof n == "object" && n.message) + if (typeof n === "object" && n.message) { let message = n.message; if (n.translateMessage) diff --git a/binaries/data/mods/public/gui/summary/counters.js b/binaries/data/mods/public/gui/summary/counters.js index 010a80b835..9de8bd23c3 100644 --- a/binaries/data/mods/public/gui/summary/counters.js +++ b/binaries/data/mods/public/gui/summary/counters.js @@ -12,7 +12,7 @@ function calculateRatio(divident, divisor) function formatSummaryValue(values) { - if (typeof values != "object") + if (typeof values !== "object") return values === Infinity ? g_InfinitySymbol : values; let ret = ""; @@ -81,7 +81,7 @@ function summaryAddObject(obj1, obj2) function summaryArraySum(array) { return array.reduce((sum, val) => { - if (typeof sum != "object") + if (typeof sum !== "object") return sum + val; summaryAddObject(sum, val); return sum; diff --git a/binaries/data/mods/public/gui/summary/summary.js b/binaries/data/mods/public/gui/summary/summary.js index f75aaf87a0..4a05794387 100644 --- a/binaries/data/mods/public/gui/summary/summary.js +++ b/binaries/data/mods/public/gui/summary/summary.js @@ -319,7 +319,7 @@ function updateTypeDropdown(number, category, item, itemNumber) { const testValue = g_ScorePanelsData[category].counters[itemNumber].fn(g_GameData.sim.playerStates[1], 0, item); const hide = !g_ScorePanelsData[category].counters[itemNumber].fn || - typeof testValue != "object" || Object.keys(testValue).length < 2; + typeof testValue !== "object" || Object.keys(testValue).length < 2; Engine.GetGUIObjectByName("chart[" + number + "]TypeLabel").hidden = hide; const chartType = Engine.GetGUIObjectByName("chart[" + number + "]TypeSelection"); chartType.hidden = hide; diff --git a/binaries/data/mods/public/maps/random/rmbiome/randombiome.js b/binaries/data/mods/public/maps/random/rmbiome/randombiome.js index b8a2981570..0f43f802eb 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/randombiome.js +++ b/binaries/data/mods/public/maps/random/rmbiome/randombiome.js @@ -49,7 +49,7 @@ function loadBiomeFile(file) const copyProperties = (from, to) => { for (const prop in from) { - if (from[prop] !== null && typeof from[prop] == "object" && !Array.isArray(from[prop])) + if (from[prop] !== null && typeof from[prop] === "object" && !Array.isArray(from[prop])) { if (!to[prop]) to[prop] = {}; diff --git a/binaries/data/mods/public/maps/random/rmgen/RandomMap.js b/binaries/data/mods/public/maps/random/rmgen/RandomMap.js index 0cb542aee7..ba20ed6620 100644 --- a/binaries/data/mods/public/maps/random/rmgen/RandomMap.js +++ b/binaries/data/mods/public/maps/random/rmgen/RandomMap.js @@ -23,7 +23,7 @@ function RandomMap(baseHeight, baseTerrain) for (let z = 0; z < this.size; ++z) this.texture[x][z] = this.getTextureID( - typeof baseTerrain == "string" ? baseTerrain : pickRandom(baseTerrain)); + typeof baseTerrain === "string" ? baseTerrain : pickRandom(baseTerrain)); } // Create 2D arrays for terrain objects and areas diff --git a/binaries/data/mods/public/maps/random/rmgen/library.js b/binaries/data/mods/public/maps/random/rmgen/library.js index ca07955e6f..bffd5b0a9e 100644 --- a/binaries/data/mods/public/maps/random/rmgen/library.js +++ b/binaries/data/mods/public/maps/random/rmgen/library.js @@ -212,7 +212,7 @@ function createObjectGroupsByAreas(group, player, constraints, amount, retryFact function createTerrain(terrain) { - return typeof terrain == "string" ? + return typeof terrain === "string" ? new SimpleTerrain(...terrain.split(TERRAIN_SEPARATOR)) : new RandomTerrain(terrain.map(t => createTerrain(t))); } diff --git a/binaries/data/mods/public/maps/random/wild_lake.js b/binaries/data/mods/public/maps/random/wild_lake.js index 3e456c4494..555162a84e 100644 --- a/binaries/data/mods/public/maps/random/wild_lake.js +++ b/binaries/data/mods/public/maps/random/wild_lake.js @@ -12,7 +12,7 @@ export function* generateMap(mapSettings) */ function getArray(stringOrArrayOfStrings) { - if (typeof stringOrArrayOfStrings == "string") + if (typeof stringOrArrayOfStrings === "string") return [stringOrArrayOfStrings]; return stringOrArrayOfStrings; } diff --git a/binaries/data/mods/public/maps/scripts/Tutorial.js b/binaries/data/mods/public/maps/scripts/Tutorial.js index b6ff201f01..abf2cf4185 100644 --- a/binaries/data/mods/public/maps/scripts/Tutorial.js +++ b/binaries/data/mods/public/maps/scripts/Tutorial.js @@ -13,7 +13,7 @@ Trigger.prototype.InitTutorial = function(data) { for (const key in goal) { - if (typeof goal[key] != "function" || this.tutorialEvents.indexOf(key) != -1) + if (typeof goal[key] !== "function" || this.tutorialEvents.indexOf(key) != -1) continue; if (key == "Init") continue; @@ -85,7 +85,7 @@ Trigger.prototype.GoalMessage = function(instructions, readyButton=false, leave= cmpGUIInterface.PushNotification({ "type": "tutorial", "players": [1], - "instructions": typeof instructions == "string" ? [instructions] : instructions, + "instructions": typeof instructions === "string" ? [instructions] : instructions, "readyButton": readyButton, "leave": leave }); diff --git a/binaries/data/mods/public/simulation/ai/common-api/entitycollection.js b/binaries/data/mods/public/simulation/ai/common-api/entitycollection.js index 6cb8cb19ad..2da47da19f 100644 --- a/binaries/data/mods/public/simulation/ai/common-api/entitycollection.js +++ b/binaries/data/mods/public/simulation/ai/common-api/entitycollection.js @@ -80,7 +80,7 @@ m.EntityCollection.prototype.toString = function() m.EntityCollection.prototype.filter = function(filter, thisp) { - if (typeof filter == "function") + if (typeof filter === "function") filter = { "func": filter, "dynamicProperties": [] }; const ret = new Map(); diff --git a/binaries/data/mods/public/simulation/components/AIInterface.js b/binaries/data/mods/public/simulation/components/AIInterface.js index 41ce2c783f..337bfc9a0a 100644 --- a/binaries/data/mods/public/simulation/components/AIInterface.js +++ b/binaries/data/mods/public/simulation/components/AIInterface.js @@ -50,7 +50,7 @@ AIInterface.prototype.Serialize = function() { if (!Object.hasOwn(this, key)) continue; - if (typeof this[key] == "function") + if (typeof this[key] === "function") continue; if (key == "templates") continue; diff --git a/binaries/data/mods/public/simulation/components/StatisticsTracker.js b/binaries/data/mods/public/simulation/components/StatisticsTracker.js index 558dfd4778..9254c800e1 100644 --- a/binaries/data/mods/public/simulation/components/StatisticsTracker.js +++ b/binaries/data/mods/public/simulation/components/StatisticsTracker.js @@ -504,10 +504,10 @@ StatisticsTracker.prototype.UpdatePeakPercentages = function() **/ StatisticsTracker.prototype.PushValue = function(fromData, toData) { - if (typeof fromData == "object") + if (typeof fromData === "object") for (const prop in fromData) { - if (typeof toData[prop] != "object") + if (typeof toData[prop] !== "object") toData[prop] = [fromData[prop]]; else this.PushValue(fromData[prop], toData[prop]); diff --git a/binaries/data/tests/test_setup.js b/binaries/data/tests/test_setup.js index 29fb67a217..b0fda6a095 100644 --- a/binaries/data/tests/test_setup.js +++ b/binaries/data/tests/test_setup.js @@ -64,7 +64,7 @@ global.TS_ASSERT_EXCEPTION = function(func) global.TS_ASSERT_NUMBER = function(value) { - if (typeof value != "number" || !isFinite(value)) + if (typeof value !== "number" || !isFinite(value)) fail("The given value must be a real number!"); };