Author: bklaas
Date: Wed Jan 16 08:31:21 2008
New Revision: 1465
URL: http://svn.slimdevices.com?rev=1465&root=Jive&view=rev
Log:
Bug: 6220
Description: strip out jive-based decision on how to style menu items. Rely on
style being sent by SC.
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
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=1465&root=Jive&r1=1464&r2=1465&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Wed
Jan 16 08:31:21 2008
@@ -1328,7 +1328,6 @@
local style = labelItemStyle
- local itemAction = {}
if style == 'item' then
local chunk = db:chunk()
local bActionPlay = _safeDeref(chunk, 'base',
'actions', 'play')
@@ -1337,27 +1336,12 @@
local iActionAdd = _safeDeref(item, 'actions',
'add')
local bActionGo = _safeDeref(chunk, 'base',
'actions', 'go')
local iActionGo = _safeDeref(item, 'actions',
'go')
- if bActionPlay or iActionPlay then
- itemAction['play'] = true
- end
- if bActionAdd or iActionAdd then
- itemAction['add'] = true
- end
- if bActionGo or iActionGo then
- itemAction['go'] = true
- end
end
if current then
style = "albumcurrent"
elseif item and item["style"] then
style = item["style"]
- -- style with a filled '>' sign if play action
- elseif itemAction['play'] then
- style = 'itemplay'
- -- only style with a '+' sign if no go or play action
- elseif itemAction['add'] and not itemAction['go'] then
- style = 'itemadd'
end
widgets[widgetIndex] = _decoratedLabel(widget, style,
item, db, menuAccel)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
