Author: bklaas
Date: Fri Feb 29 08:42:11 2008
New Revision: 2082

URL: http://svn.slimdevices.com?rev=2082&root=Jive&view=rev
Log:
Bug: 5835
Description: differentiate between 'refresh' and 'refreshOrigin' for nextWindow 
directive

'refresh' re-executes the jsonAction associated with that window

'refreshOrigin' maintains the current window but re-executes the jsonAction of 
the parent window.
This is useful for textinput windows that need to reset the default value of 
the textinput window after setting.

Modified:
    
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua

Modified: 
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL: 
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2082&root=Jive&r1=2081&r2=2082&view=diff
==============================================================================
--- 
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 (original)
+++ 
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 Fri Feb 29 08:42:11 2008
@@ -686,6 +686,17 @@
 end
 
 local function _refreshMe(step)
+       if step then
+               local timer = Timer(100,
+                       function()
+                               _refreshJSONAction(step)
+                       end, true)
+               timer:start()
+       end
+
+end
+
+local function _refreshOrigin(step)
        if step.origin then
                local timer = Timer(100,
                        function()
@@ -774,6 +785,8 @@
                _hideMe(step)
        elseif destination == 'grandparent' and step and step.window then
                _hideMeAndMyDad(step)
+       elseif destination == 'refreshOrigin' and step and step.window then
+               _refreshOrigin(step)
        elseif destination == 'refresh' and step and step.window then
                _refreshMe(step)
        end
@@ -1301,6 +1314,8 @@
                                        sink = _hideMe(_curStep)
                                elseif item['nextWindow'] == 'grandparent' then
                                        sink = _hideMeAndMyDad(_curStep)
+                               elseif item['nextWindow'] == 'refreshOrigin' 
then
+                                       sink = _refreshOrigin(_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

Reply via email to