Author: bklaas
Date: Tue Mar 2 12:50:42 2010
New Revision: 8612
URL: http://svn.slimdevices.com/jive?rev=8612&view=rev
Log:
Fixed Bug: 13691
Description: inject context = 'playlist' and currentTrack = '1' into the params
of any NP CM item
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=8612&r1=8611&r2=8612&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Tue Mar 2 12:50:42 2010
@@ -1229,6 +1229,18 @@
step.window:addWidget(textArea)
end
elseif step.menu then
+ if step._isNpChildWindow and data.item_loop then
+ for i, item in ipairs(data.item_loop) do
+ if item.actions and item.actions.go then
+ if not item.actions.go.params
then
+ item.actions.go.params
= {}
+ end
+
item.actions.go.params.currentTrack = 1
+ item.actions.go.params.context
= 'playlist'
+ end
+ end
+ end
+
_stepSetMenuItems(step, data)
if _player then
local lastBrowseIndex =
_player:getLastBrowseIndex(step.commandString)
@@ -1835,7 +1847,6 @@
-- okay to call on or off this, as they are just
special cases of 'do'
actionName = 'do'
end
-
-- is there a nextWindow on the action
aNextWindow = _safeDeref(item, 'actions', actionName,
'nextWindow') or _safeDeref(chunk, 'base', 'actions', actionName, 'nextWindow')
aSetSelectedIndex = _safeDeref(item, 'actions', actionName,
'setSelectedIndex') or _safeDeref(chunk, 'base', 'actions', actionName,
'setSelectedIndex')
@@ -3413,7 +3424,6 @@
_pushStep(step)
-- send the command
- local from, qty
_performJSONAction(jsonAction, 0, 200, step, sink)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
