Author: bklaas
Date: Thu Jul  1 07:56:31 2010
New Revision: 8916

URL: http://svn.slimdevices.com/jive?rev=8916&view=rev
Log:
Bug: n/a
Description: allow the textkey to be sent in item.textkey (primarily) or 
item.params.textkey (as a backwards compatible fallback)

Modified:
    7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua
    
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua

Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua?rev=8916&r1=8915&r2=8916&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua 
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/DB.lua Thu 
Jul  1 07:56:31 2010
@@ -199,7 +199,7 @@
 
        for i,item in ipairs(chunk["item_loop"]) do
                local index = i + tonumber(chunk["offset"])
-               local textKey = item.params and item.params.textkey
+               local textKey = item.textkey or (item.params and 
item.params.textkey)
                if textKey then
                        local textKeyIndex = self.textIndex[textKey]
                        if not textKeyIndex or textKeyIndex > index then

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=8916&r1=8915&r2=8916&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 Thu Jul  1 07:56:31 2010
@@ -648,7 +648,7 @@
                end
 
                -- set an acceleration key, but not for playlists
-               if item.params and item.params.textkey then
+               if item.textkey or (item.params and item.params.textkey) then
                        -- FIXME the, el, la, etc articles
                        group:setAccelKey(item.params.textkey)
                end

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins

Reply via email to