Author: bklaas
Date: Tue Jul 8 20:58:28 2008
New Revision: 2677
URL: http://svn.slimdevices.com?rev=2677&root=Jive&view=rev
Log:
Bug: 8680
Description: partial fix for InfoBrowser loading problem
refactor SetupNetTestMeta in the same way to use setCustomNode() homeMenu method
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua?rev=2677&root=Jive&r1=2676&r2=2677&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserApplet.lua
Tue Jul 8 20:58:28 2008
@@ -30,6 +30,7 @@
local log = require("jive.utils.log").logger("applets.misc")
local debug = require("jive.utils.debug")
+local appletManager = appletManager
module(..., Framework.constants)
oo.class(_M, Applet)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserMeta.lua?rev=2677&root=Jive&r1=2676&r2=2677&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/InfoBrowserMeta.lua
Tue Jul 8 20:58:28 2008
@@ -9,6 +9,7 @@
local oo = require("loop.simple")
local AppletMeta = require("jive.AppletMeta")
+local log = require('jive.utils.log').logger('applets.misc')
local appletManager = appletManager
local jiveMain = jiveMain
@@ -26,16 +27,23 @@
function registerApplet(meta)
jnt:subscribe(meta)
- meta.menu = meta:menuItem('appletInfoBrowser', 'extras',
meta:string('INFOBROWSER'), function(applet, ...) applet:menu(...) end, 10)
+
+ -- add the item to 'hidden' or playerCurrent notification below will
never be called
+ meta.menu = meta:menuItem('appletInfoBrowser', 'hidden',
meta:string('INFOBROWSER'), function(applet, ...) applet:menu(...) end, 10)
+ jiveMain:addItem(meta.menu)
+
end
+function notify_playerDelete(meta, player)
+ jiveMain:setCustomNode('appletInfoBrowser', 'hidden')
+end
-- only show on the menu if a player is attached
-- this allows SN to use the player id to select which information feeds to
show
function notify_playerCurrent(meta, player)
if player == nil then
- jiveMain:removeItem(meta.menu)
+ jiveMain:setCustomNode('appletInfoBrowser', 'hidden')
else
- jiveMain:addItem(meta.menu)
+ jiveMain:setCustomNode('appletInfoBrowser', 'extras')
end
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua?rev=2677&root=Jive&r1=2676&r2=2677&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
Tue Jul 8 20:58:28 2008
@@ -39,7 +39,7 @@
-- hide menu item when player goes away
function notify_playerDelete(meta, player)
- jiveMain:setNode(meta.menu, 'hidden')
+ jiveMain:setCustomNode('appletSetupNetTest', 'hidden')
end
function notify_playerCurrent(meta, player)
@@ -48,9 +48,9 @@
-- b. isn't connected to a server (now possible)
-- c. connected to SN
if player == nil or not player:getSlimServer() or (
player:getSlimServer() and player:getSlimServer():isSqueezeNetwork() ) then
- jiveMain:setNode(meta.menu, 'hidden')
+ jiveMain:setCustomNode('appletSetupNetTest', 'hidden')
else
- jiveMain:setNode(meta.menu, 'advancedSettings')
+ jiveMain:setCustomNode('appletSetupNetTest', 'advancedSettings')
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
