Author: titmuss
Date: Wed Feb 13 09:25:15 2008
New Revision: 1928
URL: http://svn.slimdevices.com?rev=1928&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1914): bklaas | 2008-02-12 00:41:28 +0000
Bug: 6997
Description: add another "special" destination for nextWindow called refresh,
which just reloads the window.
This is used for text input menus where, after entry, the initialText needs to
be 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:15 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1907
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1914
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=1928&root=Jive&r1=1927&r2=1928&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:15 2008
@@ -663,6 +663,16 @@
return popup
end
+local function _refreshMe(step)
+ if step.origin then
+ local timer = Timer(100,
+ function()
+ _refreshJSONAction(step.origin)
+ end, true)
+ timer:start()
+ end
+end
+
-- _hideMe
-- hides the top window
local function _hideMe(step)
@@ -676,6 +686,8 @@
end, true)
timer:start()
end
+
+
end
-- _goNowPlaying
@@ -718,6 +730,8 @@
_goPlaylist()
elseif destination == 'parent' and step and step.window then
_hideMe(step)
+ elseif destination == 'refresh' and step and step.window then
+ _refreshMe(step)
end
end
@@ -1240,6 +1254,8 @@
sink = goHome
elseif item['nextWindow'] == 'parent' then
sink = _hideMe(_curStep)
+ elseif item['nextWindow'] == 'refresh' then
+ sink = _refreshMe(_curStep)
elseif item["showBigArtwork"] then
sink = _bigArtworkPopup
elseif actionName == 'go'
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
