Author: titmuss
Date: Mon Feb 11 12:26:21 2008
New Revision: 1908
URL: http://svn.slimdevices.com?rev=1908&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1902): titmuss | 2008-02-11 14:31:30 +0000
Bug: 6946
Description:
Fix showBriefly to ensure that the callback is called when the window is poped
from
the window stack. Previously the callback was only called by the key press and
timer
listeners. This may fix a problem where the volume control could get stuck.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/jive/ui/Window.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 11 12:26:21 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1890
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1902
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/ui/Window.lua?rev=1908&root=Jive&r1=1907&r2=1908&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/ui/Window.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/ui/Window.lua Mon Feb 11 12:26:21 2008
@@ -277,26 +277,22 @@
return
end
+ if callback then
+ self:addListener(EVENT_WINDOW_POP, callback)
+ end
+
if self.brieflyHandler == nil then
self.brieflyHandler =
self:addListener(EVENT_KEY_PRESS | EVENT_SCROLL,
function(event)
- local r = EVENT_CONSUME
- if callback then
- r = callback()
- end
-
self:hide(popTransition,
"NONE")
- return r
+ return EVENT_CONSUME
end)
end
self.brieflyTimer = Timer(msecs,
function(timer)
self.brieflyTimer = nil
- if callback then
- callback()
- end
self:hide(popTransition, "NONE")
end,
true)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
