Partydeck/Monarch-Extension
3
0
Fork 0
mirror of https://github.com/britzl/monarch.git synced 2025-06-27 10:27:49 +02:00
Code Issues Projects Releases Wiki Activity

Added preload()

Browse Source
This commit is contained in:
Björn Ritzl 2018-06-03 17:32:13 +02:00
parent 724713f9e4
commit ffc148b4bf
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -227,6 +227,14 @@ Go back to a previous Monarch screen
* ```callback``` (function) - Optional function to call when the previous screen is visible. * ```callback``` (function) - Optional function to call when the previous screen is visible.
### monarch.preload(screen_id, [callback])
Preload a Monarch screen. This will load but not enable the screen. This is useful for content heavy screens that you wish to be able to show without having to wait for it load.
**PARAMETERS**
* ```screen_id``` (hash) - Id of the screen to preload.
* ```callback``` (function) - Optional function to call when the new screen is preloaded.
### monarch.data(screen_id) ### monarch.data(screen_id)
Get the data associated with a screen (from a call to ```monarch.show()``` or ```monarch.back()```). Get the data associated with a screen (from a call to ```monarch.show()``` or ```monarch.back()```).

41
monarch/monarch.lua
View File

@ -253,10 +253,17 @@ local function show_in(screen, previous_screen, reload, cb)
log("show_in() reloading", screen.id) log("show_in() reloading", screen.id)
unload(screen) unload(screen)
end end
-- if the screen has been preloaded we need to enable it
if screen.preloaded then
log("show_in() screen was preloaded", screen.id)
msg.post(screen.proxy, ENABLE)
screen.loaded = true
screen.preloaded = false
-- the screen could be loaded if the previous screen was a popup -- the screen could be loaded if the previous screen was a popup
-- and the popup asked to show this screen again -- and the popup asked to show this screen again
-- in that case we shouldn't attempt to load it again -- in that case we shouldn't attempt to load it again
if not screen.loaded then elseif not screen.loaded then
log("show_in() loading screen", screen.id)
async_load(screen) async_load(screen)
end end
stack[#stack + 1] = screen stack[#stack + 1] = screen
@ -275,7 +282,13 @@ local function back_in(screen, previous_screen, cb)
co = coroutine.create(function() co = coroutine.create(function()
screen.co = co screen.co = co
change_context(screen) change_context(screen)
if not screen.loaded then if screen.preloaded then
log("back_in() screen was preloaded", screen.id)
msg.post(screen.proxy, ENABLE)
screen.preloaded = false
screen.loaded = true
elseif not screen.loaded then
log("back_in() loading screen", screen.id)
async_load(screen) async_load(screen)
end end
if previous_screen and not previous_screen.popup then if previous_screen and not previous_screen.popup then
@ -413,6 +426,30 @@ function M.back(data, cb)
end end
end end
--- Preload a screen. This will load but not enable and show a screen. Useful for "heavier" screens
-- that you wish to show without any delay.
-- @param id (string|hash) - Id of the screen to preload
-- @param cb (function) - Optional callback to invoke when screen is loaded
function M.preload(id, cb)
assert(id, "You must provide a screen id")
id = tohash(id)
assert(screens[id], ("There is no screen registered with id %s"):format(tostring(id)))
local screen = screens[id]
local co
co = coroutine.create(function()
screen.co = co
change_context(screen)
screen.wait_for = PROXY_LOADED
msg.post(screen.proxy, ASYNC_LOAD)
coroutine.yield()
screen.preloaded = true
screen.wait_for = nil
if cb then cb() end
end)
coroutine.resume(co)
end
function M.on_message(message_id, message, sender) function M.on_message(message_id, message, sender)
if message_id == PROXY_LOADED then if message_id == PROXY_LOADED then