From 264edc0030be9a333be8576e02524aa0ceedc856 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sat, 10 May 2025 17:30:54 -0400 Subject: [PATCH] #592 fixed bug with pocket help page linking navigation --- pocket/iorx.lua | 2 +- pocket/pocket.lua | 8 +++++--- pocket/startup.lua | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pocket/iorx.lua b/pocket/iorx.lua index 76fcd9b..cdb5d91 100644 --- a/pocket/iorx.lua +++ b/pocket/iorx.lua @@ -314,7 +314,7 @@ function iorx.record_unit_data(data) local function blue(text) return { text = text, color = colors.blue } end -- if unit.reactor_data.rps_status then - -- for k, v in pairs(unit.alarms) do + -- for k, _ in pairs(unit.alarms) do -- unit.alarms[k] = ALARM_STATE.TRIPPED -- end -- end diff --git a/pocket/pocket.lua b/pocket/pocket.lua index e0e285c..55cc829 100644 --- a/pocket/pocket.lua +++ b/pocket/pocket.lua @@ -269,8 +269,8 @@ function pocket.init_nav(smem) -- open an app ---@param app_id POCKET_APP_ID - ---@param on_loaded? function - function nav.open_app(app_id, on_loaded) + ---@param on_ready? function + function nav.open_app(app_id, on_ready) -- reset help return on navigating out of an app if app_id == APP_ID.ROOT then self.help_return = nil end @@ -283,7 +283,7 @@ function pocket.init_nav(smem) app = self.apps[app_id] else self.loader_return = nil end - if not app.loaded then smem.q.mq_render.push_data(MQ__RENDER_DATA.LOAD_APP, { app_id, on_loaded }) end + if not app.loaded then smem.q.mq_render.push_data(MQ__RENDER_DATA.LOAD_APP, { app_id, on_ready }) end self.cur_app = app_id self.pane.set_value(app_id) @@ -291,6 +291,8 @@ function pocket.init_nav(smem) if #app.sidebar_items > 0 then self.sidebar.update(app.sidebar_items) end + + if app.loaded and on_ready then on_ready() end else log.debug("tried to open unknown app") end diff --git a/pocket/startup.lua b/pocket/startup.lua index dbebafb..71e2a73 100644 --- a/pocket/startup.lua +++ b/pocket/startup.lua @@ -22,7 +22,7 @@ local pocket = require("pocket.pocket") local renderer = require("pocket.renderer") local threads = require("pocket.threads") -local POCKET_VERSION = "v0.13.3-beta" +local POCKET_VERSION = "v0.13.4-beta" local println = util.println local println_ts = util.println_ts