Author: titmuss
Date: Thu Feb 14 04:21:10 2008
New Revision: 1951
URL: http://svn.slimdevices.com?rev=1951&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1943): andy | 2008-02-13 21:37:42 +0000
Bug 7123, prepend slashes to URIs when not already provided
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Feb 14 04:21:10 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1927
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1943
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua?rev=1951&root=Jive&r1=1950&r2=1951&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua Thu
Feb 14 04:21:10 2008
@@ -116,6 +116,12 @@
if string.match(path, '.png') then
artworkUri = string.gsub(path, '.png', resizeFrag)
end
+
+ -- Bug 7123, Add a leading slash if needed
+ if not string.find(artworkUri, "^/") then
+ artworkUri = "/" .. artworkUri
+ end
+
return artworkUri
end
@@ -151,7 +157,13 @@
if server:isSqueezeNetwork() then
-- Artwork on SN must be fetched as a normal URL
local ip, port = server:getIpPort()
- item["icon"] = 'http://' .. ip .. ':' .. port
.. '/' .. item["icon"]
+
+ -- Bug 7123, Add a leading slash if needed
+ if not string.find(item["icon"], "^/") then
+ item["icon"] = "/" .. item["icon"]
+ end
+
+ item["icon"] = 'http://' .. ip .. ':' .. port
.. item["icon"]
server:fetchArtworkURL(item["icon"], icon,
ARTWORK_SIZE)
else
server:fetchArtworkThumb(item["icon"], icon,
_staticArtworkThumbUri, ARTWORK_SIZE)
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=1951&root=Jive&r1=1950&r2=1951&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Thu
Feb 14 04:21:10 2008
@@ -219,6 +219,11 @@
-- and we don't want this in gd format, because that doesn't
work
imgFormat = 'png'
artworkUri = string.gsub(iconId, '.png', resizeFrag .. '.' ..
imgFormat)
+
+ -- Bug 7123, Add a leading slash if needed
+ if not string.find(artworkUri, "^/") then
+ artworkUri = "/" .. artworkUri
+ end
-- otherwise punt
else
return iconId
@@ -289,6 +294,12 @@
if string.match(path, '.png') then
artworkUri = string.gsub(path, '.png', resizeFrag)
end
+
+ -- Bug 7123, Add a leading slash if needed
+ if not string.find(artworkUri, "^/") then
+ artworkUri = "/" .. artworkUri
+ end
+
return artworkUri
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
