Details
- Reviewers
Imarok - Commits
- rP23789: Absorb duplicated summary tab code to the tab_buttons gui
Notice duplication is gone,
yell for hiding magical values,
maybe yell for some jsDocs,
make sure panel/chart remember still works, and the front doesn't fall
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
binaries/data/mods/public/gui/common/tab_buttons.js | ||
---|---|---|
9 ↗ | (On Diff #5165) | g_Tab prefix, the variable name sounds like it's very easy to get a naming conflict with some other global. |
85 ↗ | (On Diff #5165) | Don't split strings that are filenames, people should be able to search for them |
Successful build - Chance fights ever on the side of the prudent.
Updating workspaces... Build (release)... Build (debug)... Running release tests... Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
Successful build - Chance fights ever on the side of the prudent.
Updating workspaces... Build (release)... Build (debug)... Running release tests... Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
Successful build - Chance fights ever on the side of the prudent.
Updating workspaces... Build (release)... Build (debug)... Running release tests... Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
binaries/data/mods/public/gui/common/tab_buttons.js | ||
---|---|---|
25 ↗ | (On Diff #5200) | https://jsdoc.app/tags-type.html I believe it should be boolean :) |
binaries/data/mods/public/gui/summary/layout.js | ||
228 ↗ | (On Diff #5200) | Jsdoc ? |
Build failure - The Moirai have given mortals hearts that can endure.
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2119/display/redirect
Build failure - The Moirai have given mortals hearts that can endure.
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2120/display/redirect
ERROR: GL error GL_INVALID_VALUE (0x0501) occurred in the Single-Player Game Setup menu. (With buttons on the right-hand side not present.)
Build failure - The Moirai have given mortals hearts that can endure.
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2123/display/redirect
Build failure - The Moirai have given mortals hearts that can endure.
Linter detected issues: Executing section Source... Executing section JS... | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 119| 119| sprintf( | 120| 120| option.min !== undefined && option.max !== undefined ? | 121| 121| translateWithContext("option number", "Min: %(min)s, Max: %(max)s") : | 122| |- option.min !== undefined && option.max === undefined ? | | 122|+ option.min !== undefined && option.max === undefined ? | 123| 123| translateWithContext("option number", "Min: %(min)s") : | 124| 124| option.min === undefined && option.max !== undefined ? | 125| 125| translateWithContext("option number", "Max: %(max)s") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 5. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 120| 120| option.min !== undefined && option.max !== undefined ? | 121| 121| translateWithContext("option number", "Min: %(min)s, Max: %(max)s") : | 122| 122| option.min !== undefined && option.max === undefined ? | 123| |- translateWithContext("option number", "Min: %(min)s") : | | 123|+ translateWithContext("option number", "Min: %(min)s") : | 124| 124| option.min === undefined && option.max !== undefined ? | 125| 125| translateWithContext("option number", "Max: %(max)s") : | 126| 126| "", | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 121| 121| translateWithContext("option number", "Min: %(min)s, Max: %(max)s") : | 122| 122| option.min !== undefined && option.max === undefined ? | 123| 123| translateWithContext("option number", "Min: %(min)s") : | 124| |- option.min === undefined && option.max !== undefined ? | | 124|+ option.min === undefined && option.max !== undefined ? | 125| 125| translateWithContext("option number", "Max: %(max)s") : | 126| 126| "", | 127| 127| { | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 5. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 122| 122| option.min !== undefined && option.max === undefined ? | 123| 123| translateWithContext("option number", "Min: %(min)s") : | 124| 124| option.min === undefined && option.max !== undefined ? | 125| |- translateWithContext("option number", "Max: %(max)s") : | | 125|+ translateWithContext("option number", "Max: %(max)s") : | 126| 126| "", | 127| 127| { | 128| 128| "min": option.min, | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 5. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 123| 123| translateWithContext("option number", "Min: %(min)s") : | 124| 124| option.min === undefined && option.max !== undefined ? | 125| 125| translateWithContext("option number", "Max: %(max)s") : | 126| |- "", | | 126|+ "", | 127| 127| { | 128| 128| "min": option.min, | 129| 129| "max": option.max binaries/data/mods/public/gui/options/options.js | 240| » » » let·value·=·optionType.guiToValue(control); | | [NORMAL] ESLintBear (no-shadow): | | 'value' is already declared in the upper scope. | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 450| 450| Engine.GetGUIObjectByName("summaryText").caption = | 451| 451| g_GameData.gui.isInGame ? | 452| 452| translate("Current Scores") : | 453| |- g_GameData.gui.isReplay ? | | 453|+ g_GameData.gui.isReplay ? | 454| 454| translate("Scores at the end of the game.") : | 455| 455| g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 4 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 451| 451| g_GameData.gui.isInGame ? | 452| 452| translate("Current Scores") : | 453| 453| g_GameData.gui.isReplay ? | 454| |- translate("Scores at the end of the game.") : | | 454|+ translate("Scores at the end of the game.") : | 455| 455| g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | 457| 457| !assignedState ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 4 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 452| 452| translate("Current Scores") : | 453| 453| g_GameData.gui.isReplay ? | 454| 454| translate("Scores at the end of the game.") : | 455| |- g_GameData.gui.disconnected ? | | 455|+ g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | 457| 457| !assignedState ? | 458| 458| translate("You have left the game.") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 453| 453| g_GameData.gui.isReplay ? | 454| 454| translate("Scores at the end of the game.") : | 455| 455| g_GameData.gui.disconnected ? | 456| |- translate("You have been disconnected.") : | | 456|+ translate("You have been disconnected.") : | 457| 457| !assignedState ? | 458| 458| translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 454| 454| translate("Scores at the end of the game.") : | 455| 455| g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | 457| |- !assignedState ? | | 457|+ !assignedState ? | 458| 458| translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 455| 455| g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | 457| 457| !assignedState ? | 458| |- translate("You have left the game.") : | | 458|+ translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 456| 456| translate("You have been disconnected.") : | 457| 457| !assignedState ? | 458| 458| translate("You have left the game.") : | 459| |- assignedState.state == "won" ? | | 459|+ assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | 462| 462| translate("You have been defeated…") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 457| 457| !assignedState ? | 458| 458| translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | 460| |- translate("You have won the battle!") : | | 460|+ translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | 462| 462| translate("You have been defeated…") : | 463| 463| translate("You have abandoned the game."); | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 458| 458| translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | 461| |- assignedState.state == "defeated" ? | | 461|+ assignedState.state == "defeated" ? | 462| 462| translate("You have been defeated…") : | 463| 463| translate("You have abandoned the game."); | 464| 464| | | [NORMAL] ESLintBear (indent): | | Expected indentation of 8 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 459| 459| assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | 462| |- translate("You have been defeated…") : | | 462|+ translate("You have been defeated…") : | 463| 463| translate("You have abandoned the game."); | 464| 464| | 465| 465| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | | [NORMAL] ESLintBear (indent): | | Expected indentation of 8 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 460| 460| translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | 462| 462| translate("You have been defeated…") : | 463| |- translate("You have abandoned the game."); | | 463|+ translate("You have abandoned the game."); | 464| 464| | 465| 465| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | 466| 466| translate("Game time elapsed: %(time)s"), { | | [NORMAL] ESLintBear (indent): | | Expected indentation of 2 tabs but found 1. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 465| 465| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | 466| 466| translate("Game time elapsed: %(time)s"), { | 467| 467| "time": timeToString(g_GameData.sim.timeElapsed) | 468| |- }); | | 468|+ }); | 469| 469| | 470| 470| let mapType = g_Settings.MapTypes.find(type => type.Name == g_GameData.sim.mapSettings.mapType); | 471| 471| let mapSize = g_Settings.MapSizes.find(size => size.Tiles == g_GameData.sim.mapSettings.Size || 0); binaries/data/mods/public/gui/summary/summary.js | 498| ·» » allPanelsData[tab].tooltip·= | | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs): | | Mixed spaces and tabs. binaries/data/mods/public/gui/summary/summary.js | 499| ·» » » sprintf(translate("Toggle·the·%(name)s·summary·tab."),·{·"name":·allPanelsData[tab].label·})·+ | | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs): | | Mixed spaces and tabs. binaries/data/mods/public/gui/summary/summary.js | 500| ·» » » colorizeHotkey("\n"·+·translate("Use·%(hotkey)s·to·move·a·summary·tab·right."),·"tab.next")·+ | | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs): | | Mixed spaces and tabs. Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2508/display/redirect
Build failure - The Moirai have given mortals hearts that can endure.
Linter detected issues: Executing section Source... Executing section JS... | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 119| 119| sprintf( | 120| 120| option.min !== undefined && option.max !== undefined ? | 121| 121| translateWithContext("option number", "Min: %(min)s, Max: %(max)s") : | 122| |- option.min !== undefined && option.max === undefined ? | | 122|+ option.min !== undefined && option.max === undefined ? | 123| 123| translateWithContext("option number", "Min: %(min)s") : | 124| 124| option.min === undefined && option.max !== undefined ? | 125| 125| translateWithContext("option number", "Max: %(max)s") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 5. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 120| 120| option.min !== undefined && option.max !== undefined ? | 121| 121| translateWithContext("option number", "Min: %(min)s, Max: %(max)s") : | 122| 122| option.min !== undefined && option.max === undefined ? | 123| |- translateWithContext("option number", "Min: %(min)s") : | | 123|+ translateWithContext("option number", "Min: %(min)s") : | 124| 124| option.min === undefined && option.max !== undefined ? | 125| 125| translateWithContext("option number", "Max: %(max)s") : | 126| 126| "", | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 4. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 121| 121| translateWithContext("option number", "Min: %(min)s, Max: %(max)s") : | 122| 122| option.min !== undefined && option.max === undefined ? | 123| 123| translateWithContext("option number", "Min: %(min)s") : | 124| |- option.min === undefined && option.max !== undefined ? | | 124|+ option.min === undefined && option.max !== undefined ? | 125| 125| translateWithContext("option number", "Max: %(max)s") : | 126| 126| "", | 127| 127| { | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 5. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 122| 122| option.min !== undefined && option.max === undefined ? | 123| 123| translateWithContext("option number", "Min: %(min)s") : | 124| 124| option.min === undefined && option.max !== undefined ? | 125| |- translateWithContext("option number", "Max: %(max)s") : | | 125|+ translateWithContext("option number", "Max: %(max)s") : | 126| 126| "", | 127| 127| { | 128| 128| "min": option.min, | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 5. |----| | /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/options/options.js | 123| 123| translateWithContext("option number", "Min: %(min)s") : | 124| 124| option.min === undefined && option.max !== undefined ? | 125| 125| translateWithContext("option number", "Max: %(max)s") : | 126| |- "", | | 126|+ "", | 127| 127| { | 128| 128| "min": option.min, | 129| 129| "max": option.max binaries/data/mods/public/gui/options/options.js | 240| » » » let·value·=·optionType.guiToValue(control); | | [NORMAL] ESLintBear (no-shadow): | | 'value' is already declared in the upper scope. | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 450| 450| Engine.GetGUIObjectByName("summaryText").caption = | 451| 451| g_GameData.gui.isInGame ? | 452| 452| translate("Current Scores") : | 453| |- g_GameData.gui.isReplay ? | | 453|+ g_GameData.gui.isReplay ? | 454| 454| translate("Scores at the end of the game.") : | 455| 455| g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 4 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 451| 451| g_GameData.gui.isInGame ? | 452| 452| translate("Current Scores") : | 453| 453| g_GameData.gui.isReplay ? | 454| |- translate("Scores at the end of the game.") : | | 454|+ translate("Scores at the end of the game.") : | 455| 455| g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | 457| 457| !assignedState ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 4 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 452| 452| translate("Current Scores") : | 453| 453| g_GameData.gui.isReplay ? | 454| 454| translate("Scores at the end of the game.") : | 455| |- g_GameData.gui.disconnected ? | | 455|+ g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | 457| 457| !assignedState ? | 458| 458| translate("You have left the game.") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 453| 453| g_GameData.gui.isReplay ? | 454| 454| translate("Scores at the end of the game.") : | 455| 455| g_GameData.gui.disconnected ? | 456| |- translate("You have been disconnected.") : | | 456|+ translate("You have been disconnected.") : | 457| 457| !assignedState ? | 458| 458| translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 454| 454| translate("Scores at the end of the game.") : | 455| 455| g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | 457| |- !assignedState ? | | 457|+ !assignedState ? | 458| 458| translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 455| 455| g_GameData.gui.disconnected ? | 456| 456| translate("You have been disconnected.") : | 457| 457| !assignedState ? | 458| |- translate("You have left the game.") : | | 458|+ translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 456| 456| translate("You have been disconnected.") : | 457| 457| !assignedState ? | 458| 458| translate("You have left the game.") : | 459| |- assignedState.state == "won" ? | | 459|+ assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | 462| 462| translate("You have been defeated…") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 457| 457| !assignedState ? | 458| 458| translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | 460| |- translate("You have won the battle!") : | | 460|+ translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | 462| 462| translate("You have been defeated…") : | 463| 463| translate("You have abandoned the game."); | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 458| 458| translate("You have left the game.") : | 459| 459| assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | 461| |- assignedState.state == "defeated" ? | | 461|+ assignedState.state == "defeated" ? | 462| 462| translate("You have been defeated…") : | 463| 463| translate("You have abandoned the game."); | 464| 464| | | [NORMAL] ESLintBear (indent): | | Expected indentation of 8 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 459| 459| assignedState.state == "won" ? | 460| 460| translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | 462| |- translate("You have been defeated…") : | | 462|+ translate("You have been defeated…") : | 463| 463| translate("You have abandoned the game."); | 464| 464| | 465| 465| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | | [NORMAL] ESLintBear (indent): | | Expected indentation of 8 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 460| 460| translate("You have won the battle!") : | 461| 461| assignedState.state == "defeated" ? | 462| 462| translate("You have been defeated…") : | 463| |- translate("You have abandoned the game."); | | 463|+ translate("You have abandoned the game."); | 464| 464| | 465| 465| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | 466| 466| translate("Game time elapsed: %(time)s"), { | | [NORMAL] ESLintBear (indent): | | Expected indentation of 2 tabs but found 1. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 465| 465| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | 466| 466| translate("Game time elapsed: %(time)s"), { | 467| 467| "time": timeToString(g_GameData.sim.timeElapsed) | 468| |- }); | | 468|+ }); | 469| 469| | 470| 470| let mapType = g_Settings.MapTypes.find(type => type.Name == g_GameData.sim.mapSettings.mapType); | 471| 471| let mapSize = g_Settings.MapSizes.find(size => size.Tiles == g_GameData.sim.mapSettings.Size || 0); Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2509/display/redirect
Looks very good.
Notice my two comments.
binaries/data/mods/public/gui/common/tab_buttons.js | ||
---|---|---|
7 ↗ | (On Diff #12435) | Sounds grammatically weird. |
binaries/data/mods/public/gui/summary/summary.js | ||
177 ↗ | (On Diff #12435) | Hmm, doesn't this assume that the charts panel is always at last place? |