Author: titmuss
Date: Mon Feb 4 15:36:03 2008
New Revision: 1805
URL: http://svn.slimdevices.com?rev=1805&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1795): titmuss | 2008-02-04 23:19:45 +0000
Bug: 6918
Description:
Revert r1789, .origin is needed.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 4 15:36:03 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1794
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1795
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=1805&root=Jive&r1=1804&r2=1805&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Mon
Feb 4 15:36:03 2008
@@ -1579,6 +1579,10 @@
-- cancel the step to prevent new data being loaded
step.cancelled = true
+
+ if _curStep and _curStep.origin then
+ _curStep = _curStep.origin
+ end
end
)
@@ -1742,6 +1746,7 @@
if _statusStep then
-- arrange so that menuListener works
+ _statusStep.origin = _curStep
_curStep = _statusStep
-- current playlist should select currently playing item
@@ -2179,7 +2184,20 @@
_server = false
_string = false
- log:info("done SlimBrowserApplet:free()")
+ -- walk down our path and close...
+ local step = _curStep
+
+ while step do
+ step.window:hide()
+ step = step.origin
+ end
+
+ local step = _statusStep
+
+ while step do
+ step.window:hide()
+ step = step.origin
+ end
return true
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
