Author: titmuss
Date: Wed Feb 13 09:25:58 2008
New Revision: 1931
URL: http://svn.slimdevices.com?rev=1931&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1917): bklaas | 2008-02-12 15:05:37 +0000
Bug: 6818
Description: add hooks for a new nextWindow destination: 'grandparent'
in this case the top window and the parent are both hidden, and if the
grandparent
had a json action that created it, it is requested again and the menu is
updated
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Feb 13 09:25:58 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1916
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1917
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=1931&root=Jive&r1=1930&r2=1931&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Wed
Feb 13 09:25:58 2008
@@ -673,8 +673,28 @@
end
end
+-- _hideMeAndMyDad
+-- hides the top window and the parent below it, refreshing the 'grandparent'
window via a new request
+local function _hideMeAndMyDad(step)
+ Framework:playSound("WINDOWHIDE")
+ step.window:hide()
+ if step.origin then
+ local parentStep = step.origin
+ if parentStep.origin then
+ parentStep.window:hide()
+ local grandparentStep = parentStep.origin
+ local timer = Timer(1000,
+ function()
+ _refreshJSONAction(grandparentStep)
+ end, true)
+ timer:start()
+ end
+ end
+end
+
+
-- _hideMe
--- hides the top window
+-- hides the top window and refreshes the parent window, via a new request
local function _hideMe(step)
Framework:playSound("WINDOWHIDE")
step.window:hide()
@@ -730,6 +750,8 @@
_goPlaylist()
elseif destination == 'parent' and step and step.window then
_hideMe(step)
+ elseif destination == 'grandparent' and step and step.window then
+ _hideMeAndMyDad(step)
elseif destination == 'refresh' and step and step.window then
_refreshMe(step)
end
@@ -1254,6 +1276,8 @@
sink = goHome
elseif item['nextWindow'] == 'parent' then
sink = _hideMe(_curStep)
+ elseif item['nextWindow'] == 'grandparent' then
+ sink = _hideMeAndMyDad(_curStep)
elseif item['nextWindow'] == 'refresh' then
sink = _refreshMe(_curStep)
elseif item["showBigArtwork"] then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
