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

Changed from listeners to transition_listeners table to be more explicit

Browse Source
This commit is contained in:
Björn Ritzl 2019-03-08 09:07:12 +01:00
parent 7d986ada1b
commit 35dd0c3f70
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
monarch/monarch.lua
View File

@ -39,8 +39,8 @@ local screens = {}
-- the current stack of screens -- the current stack of screens
local stack = {} local stack = {}
-- navigation listeners -- transition listeners
local listeners = {} local transition_listeners = {}
-- the number of active transitions -- the number of active transitions
-- monarch is considered busy while there are active transitions -- monarch is considered busy while there are active transitions
@ -61,9 +61,9 @@ local function tohash(s)
return hash_lookup[s] return hash_lookup[s]
end end
local function notify_listeners(message_id, message) local function notify_transition_listeners(message_id, message)
log("notify_listeners()", message_id) log("notify_transition_listeners()", message_id)
for _,url in pairs(listeners) do for _,url in pairs(transition_listeners) do
msg.post(url, message_id, message or {}) msg.post(url, message_id, message or {})
end end
end end
@ -415,8 +415,8 @@ local function show_out(screen, next_screen, cb)
local co local co
co = coroutine.create(function() co = coroutine.create(function()
active_transition_count = active_transition_count + 1 active_transition_count = active_transition_count + 1
notify_listeners(M.SCREEN_TRANSITION_OUT_STARTED, { screen = screen.id, next_screen = next_screen.id })
screen.co = co screen.co = co
notify_transition_listeners(M.SCREEN_TRANSITION_OUT_STARTED, { screen = screen.id, next_screen = next_screen.id })
change_context(screen) change_context(screen)
release_input(screen) release_input(screen)
focus_lost(screen, next_screen) focus_lost(screen, next_screen)
@ -434,7 +434,7 @@ local function show_out(screen, next_screen, cb)
screen.co = nil screen.co = nil
active_transition_count = active_transition_count - 1 active_transition_count = active_transition_count - 1
if cb then cb() end if cb then cb() end
notify_listeners(M.SCREEN_TRANSITION_OUT_FINISHED, { screen = screen.id, next_screen = next_screen.id }) notify_transition_listeners(M.SCREEN_TRANSITION_OUT_FINISHED, { screen = screen.id, next_screen = next_screen.id })
end) end)
coroutine.resume(co) coroutine.resume(co)
end end
@ -444,8 +444,8 @@ local function show_in(screen, previous_screen, reload, add_to_stack, cb)
local co local co
co = coroutine.create(function() co = coroutine.create(function()
active_transition_count = active_transition_count + 1 active_transition_count = active_transition_count + 1
notify_listeners(M.SCREEN_TRANSITION_IN_STARTED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id })
screen.co = co screen.co = co
notify_transition_listeners(M.SCREEN_TRANSITION_IN_STARTED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id })
change_context(screen) change_context(screen)
if reload and screen.loaded then if reload and screen.loaded then
log("show_in() reloading", screen.id) log("show_in() reloading", screen.id)
@ -462,7 +462,7 @@ local function show_in(screen, previous_screen, reload, add_to_stack, cb)
screen.co = nil screen.co = nil
active_transition_count = active_transition_count - 1 active_transition_count = active_transition_count - 1
if cb then cb() end if cb then cb() end
notify_listeners(M.SCREEN_TRANSITION_IN_FINISHED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id }) notify_transition_listeners(M.SCREEN_TRANSITION_IN_FINISHED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id })
end) end)
coroutine.resume(co) coroutine.resume(co)
end end
@ -472,8 +472,8 @@ local function back_in(screen, previous_screen, cb)
local co local co
co = coroutine.create(function() co = coroutine.create(function()
active_transition_count = active_transition_count + 1 active_transition_count = active_transition_count + 1
notify_listeners(M.SCREEN_TRANSITION_IN_STARTED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id })
screen.co = co screen.co = co
notify_transition_listeners(M.SCREEN_TRANSITION_IN_STARTED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id })
change_context(screen) change_context(screen)
load(screen) load(screen)
reset_timestep(screen) reset_timestep(screen)
@ -485,7 +485,7 @@ local function back_in(screen, previous_screen, cb)
screen.co = nil screen.co = nil
active_transition_count = active_transition_count - 1 active_transition_count = active_transition_count - 1
if cb then cb() end if cb then cb() end
notify_listeners(M.SCREEN_TRANSITION_IN_FINISHED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id }) notify_transition_listeners(M.SCREEN_TRANSITION_IN_FINISHED, { screen = screen.id, previous_screen = previous_screen and previous_screen.id })
end) end)
coroutine.resume(co) coroutine.resume(co)
end end
@ -494,7 +494,7 @@ local function back_out(screen, next_screen, cb)
log("back_out()", screen.id) log("back_out()", screen.id)
local co local co
co = coroutine.create(function() co = coroutine.create(function()
notify_listeners(M.SCREEN_TRANSITION_OUT_STARTED, { screen = screen.id, next_screen = next_screen and next_screen.id }) notify_transition_listeners(M.SCREEN_TRANSITION_OUT_STARTED, { screen = screen.id, next_screen = next_screen and next_screen.id })
active_transition_count = active_transition_count + 1 active_transition_count = active_transition_count + 1
screen.co = co screen.co = co
change_context(screen) change_context(screen)
@ -508,7 +508,7 @@ local function back_out(screen, next_screen, cb)
screen.co = nil screen.co = nil
active_transition_count = active_transition_count - 1 active_transition_count = active_transition_count - 1
if cb then cb() end if cb then cb() end
notify_listeners(M.SCREEN_TRANSITION_OUT_FINISHED, { screen = screen.id, next_screen = next_screen and next_screen.id }) notify_transition_listeners(M.SCREEN_TRANSITION_OUT_FINISHED, { screen = screen.id, next_screen = next_screen and next_screen.id })
end) end)
coroutine.resume(co) coroutine.resume(co)
end end
@ -828,7 +828,7 @@ end
-- @param url The url to notify, nil for current url -- @param url The url to notify, nil for current url
function M.add_listener(url) function M.add_listener(url)
url = url or msg.url() url = url or msg.url()
listeners[url_to_key(url)] = url transition_listeners[url_to_key(url)] = url
end end
@ -836,7 +836,7 @@ end
-- @param url The url to remove, nil for current url -- @param url The url to remove, nil for current url
function M.remove_listener(url) function M.remove_listener(url)
url = url or msg.url() url = url or msg.url()
listeners[url_to_key(url)] = nil transition_listeners[url_to_key(url)] = nil
end end