Author: bklaas
Date: Thu Mar 11 08:54:28 2010
New Revision: 8651
URL: http://svn.slimdevices.com/jive?rev=8651&view=rev
Log:
Bug: 13787
Bug: 13691
Description: revert changes to fix bug 13787. Adding tags to XMLBrowse request
is not a good road to go down.
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=8651&r1=8650&r2=8651&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
Thu Mar 11 08:54:28 2010
@@ -1229,18 +1229,6 @@
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)
@@ -2607,7 +2595,6 @@
sink = false, -- sink closure embedding this step
data = data, -- data (generic)
actionModifier = false, -- modifier
- _isNpChildWindow = origin and origin._isNpChildWindow,
--children of NP children are also NP children
}
log:debug("new step: " , step)
@@ -3366,7 +3353,7 @@
function showCurrentTrack()
local currentIndex = _player:getPlaylistCurrentIndex()
- showTrack(currentIndex, true)
+ showTrack(currentIndex)
end
function setPresetCurrentTrack(self, preset)
@@ -3389,7 +3376,7 @@
end
-function showTrack(index, currentTrack)
+function showTrack(index)
local serverIndex = index - 1
local jsonAction = {
cmd = { 'contextmenu' },
@@ -3404,9 +3391,6 @@
context = 'playlist',
},
}
- if currentTrack then
- jsonAction.params.currentTrack = 1
- end
-- determine style
local newWindowSpec = {
['isContextMenu'] = true,
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
