From 3d8971dacaf3b8160ceb9e7ab0c410d1c769ed87 Mon Sep 17 00:00:00 2001 From: phosit Date: Wed, 23 Apr 2025 13:23:04 +0200 Subject: [PATCH] Remove pageLoop That functionality is now built in to the engine. --- .../public/gui/common/functions_utility.js | 18 ------------------ .../Panels/Buttons/CivInfoButton.js | 2 +- .../mods/public/gui/pregame/MainMenuItems.js | 4 ++-- .../gui/reference/civinfo/CivInfoPage.js | 8 ++++---- .../reference/common/Buttons/CivInfoButton.js | 8 ++++---- .../common/Buttons/StructreeButton.js | 8 ++++---- .../public/gui/session/top_panel/CivIcon.js | 2 +- 7 files changed, 16 insertions(+), 34 deletions(-) diff --git a/binaries/data/mods/public/gui/common/functions_utility.js b/binaries/data/mods/public/gui/common/functions_utility.js index 539e4fe9d6..fe3d98f822 100644 --- a/binaries/data/mods/public/gui/common/functions_utility.js +++ b/binaries/data/mods/public/gui/common/functions_utility.js @@ -301,24 +301,6 @@ function getBuildString() }); } -/** - * Opens a page. If that page completes with an object with a @a nextPage - * property that page is opened with the @a args property of that object. - * That continues untill there is no @a nextPage property in the completion - * value. If there is no @a nextPage in the completion value the - * @a completionValue is returned. - * @param {String} page - The page first opened. - * @param args - passed to the first page opened. - */ -async function pageLoop(page, args) -{ - let completionValue = { "nextPage": page, "args": args }; - while (completionValue?.nextPage != null) - completionValue = await Engine.OpenChildPage(completionValue.nextPage, completionValue.args); - - return completionValue; -} - function formatXmppAnnouncement(subject, text) { var message = ""; diff --git a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CivInfoButton.js b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CivInfoButton.js index 24566f2b9a..96d9c27b6f 100644 --- a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CivInfoButton.js +++ b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CivInfoButton.js @@ -25,7 +25,7 @@ class CivInfoButton async openPage(page) { - this.civInfo = await pageLoop(page, this.civInfo.args); + this.civInfo = await Engine.OpenChildPage(page, this.civInfo.args); } } diff --git a/binaries/data/mods/public/gui/pregame/MainMenuItems.js b/binaries/data/mods/public/gui/pregame/MainMenuItems.js index 688da56df1..bbe990427f 100644 --- a/binaries/data/mods/public/gui/pregame/MainMenuItems.js +++ b/binaries/data/mods/public/gui/pregame/MainMenuItems.js @@ -47,7 +47,7 @@ export const mainMenuItems = [ "hotkey": "structree", "onPress": () => { - pageLoop("page_structree.xml"); + Engine.OpenChildPage("page_structree.xml"); } }, { @@ -56,7 +56,7 @@ export const mainMenuItems = [ "hotkey": "civinfo", "onPress": () => { - pageLoop("page_civinfo.xml"); + Engine.OpenChildPage("page_civinfo.xml"); } }, { diff --git a/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js b/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js index 58e4f2f20a..d3fd4a4ea5 100644 --- a/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js +++ b/binaries/data/mods/public/gui/reference/civinfo/CivInfoPage.js @@ -25,12 +25,12 @@ class CivInfoPage extends ReferencePage switchToStructreePage() { - this.closePageCallback({ - "nextPage": "page_structree.xml", - "args": { + this.closePageCallback({ [Engine.openRequest] : { + "page": "page_structree.xml", + "argument": { "civ": this.activeCiv } - }); + }}); } closePage() diff --git a/binaries/data/mods/public/gui/reference/common/Buttons/CivInfoButton.js b/binaries/data/mods/public/gui/reference/common/Buttons/CivInfoButton.js index ec934f62ab..9c55ae7977 100644 --- a/binaries/data/mods/public/gui/reference/common/Buttons/CivInfoButton.js +++ b/binaries/data/mods/public/gui/reference/common/Buttons/CivInfoButton.js @@ -12,12 +12,12 @@ class CivInfoButton onPress() { - this.parentPage.closePageCallback({ - "nextPage": "page_civinfo.xml", - "args": { + this.parentPage.closePageCallback({ [Engine.openRequest] : { + "page": "page_civinfo.xml", + "argument": { "civ": this.parentPage.activeCiv } - }); + }}); } } diff --git a/binaries/data/mods/public/gui/reference/common/Buttons/StructreeButton.js b/binaries/data/mods/public/gui/reference/common/Buttons/StructreeButton.js index f195bb7533..6377e7fc8b 100644 --- a/binaries/data/mods/public/gui/reference/common/Buttons/StructreeButton.js +++ b/binaries/data/mods/public/gui/reference/common/Buttons/StructreeButton.js @@ -12,12 +12,12 @@ class StructreeButton onPress() { - this.parentPage.closePageCallback({ - "nextPage": "page_structree.xml", - "args": { + this.parentPage.closePageCallback({ [Engine.openRequest] : { + "page": "page_structree.xml", + "argument": { "civ": this.parentPage.activeCiv } - }); + }}); } } diff --git a/binaries/data/mods/public/gui/session/top_panel/CivIcon.js b/binaries/data/mods/public/gui/session/top_panel/CivIcon.js index ca8cf73c6d..30281af3bc 100644 --- a/binaries/data/mods/public/gui/session/top_panel/CivIcon.js +++ b/binaries/data/mods/public/gui/session/top_panel/CivIcon.js @@ -34,7 +34,7 @@ class CivIcon closeOpenDialogs(); g_PauseControl.implicitPause(); - this.dialogSelection = await pageLoop( + this.dialogSelection = await Engine.OpenChildPage( page, { // If an Observer triggers `openPage()` via hotkey, g_ViewedPlayer could be -1 or 0