Author: titmuss
Date: Thu Jan 24 14:17:05 2008
New Revision: 1619
URL: http://svn.slimdevices.com?rev=1619&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1616): bklaas | 2008-01-24 21:56:43 +0000
Bug: 6177, 6200, 5661
Description: add support for nextWindow = 'parent', which will cause a
SlimBrowser action to hide the current window and show the previous
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 24 14:17:05 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1613
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1616
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1619&root=Jive&r1=1618&r2=1619&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Thu
Jan 24 14:17:05 2008
@@ -555,6 +555,13 @@
popup:addWidget(icon)
popup:show()
return popup
+end
+
+-- _hideMe
+-- hides the top window
+local function _hideMe(step)
+ Framework:playSound("WINDOWHIDE")
+ step.window:hide()
end
-- _goNowPlaying
@@ -1077,6 +1084,8 @@
sink = _goPlaylist
elseif item['nextWindow'] == 'home' then
sink = goHome
+ elseif item['nextWindow'] == 'parent' then
+ sink = _hideMe(_curStep)
elseif item["showBigArtwork"] then
sink = _bigArtworkPopup
elseif actionName == 'go' then
@@ -1566,7 +1575,7 @@
local windowStack = Framework.windowStack
Framework:playSound("JUMP")
while #windowStack > 1 do
- windowStack[#windowStack - 1]:hide(nil, "JUMP")
+ windowStack[#windowStack - 1]:hide()
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
