Author: agrundman
Date: Wed Aug 31 07:09:18 2011
New Revision: 9498
URL: http://svn.slimdevices.com/jive?rev=9498&view=rev
Log:
r79403@andy-imac (orig r9496): mherger | 2011-08-31 03:35:21 -0400
Bug: n/a
Description: in an attempt to escape the URL input screen people often
accidentally invalidate the default url. If the new value is a sub-string of
the default value, replace it with the default value.
r79404@andy-imac (orig r9497): ayoung | 2011-08-31 09:15:07 -0400
bug 17518: Touch and Radio lost mySB.com connexion since 7.6.1
Ignore undefined player name.
Modified:
7.6/branches/usb-audio/ (props changed)
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.6/branches/usb-audio/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Aug 31 07:09:18 2011
@@ -15,7 +15,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9408
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9493
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9497
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua?rev=9498&r1=9497&r2=9498&view=diff
==============================================================================
---
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua
(original)
+++
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageSourceHttp.lua
Wed Aug 31 07:09:18 2011
@@ -40,6 +40,8 @@
function __init(self, applet)
log:info("initialize ImageSourceHttp")
obj = oo.rawnew(self, ImageSource(applet))
+
+ obj:_fixImageListURL()
obj.imgFiles = {}
obj:readImageList()
@@ -149,6 +151,8 @@
log:debug("Input " .. value)
self.applet:getSettings()["http.path"] = value
self.applet:storeSettings()
+
+ self:_fixImageListURL();
window:playSound("WINDOWSHOW")
window:hide(Window.transitionPushLeft)
@@ -166,6 +170,21 @@
return window
end
+
+-- in an attempt to escape the URL input screen people often accidentally
invalidate the default url
+-- if the new value is a sub-string of the default value, revert it
+function _fixImageListURL(self)
+ local urlString = self.applet:getSettings()["http.path"]
+ local defaultUrl = self.applet:getDefaultSettings()["http.path"]
+
+ if (urlString != defaultUrl and string.find(defaultUrl, urlString, 1,
true)) then
+ log:warn("Invalid URL: " .. urlString)
+ log:warn("Replacing with default value")
+ self.applet:getSettings()["http.path"] = defaultUrl
+ self.applet:storeSettings()
+ end
+end
+
--[[
=head1 LICENSE
Modified:
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=9498&r1=9497&r2=9498&view=diff
==============================================================================
---
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
(original)
+++
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Wed Aug 31 07:09:18 2011
@@ -463,8 +463,8 @@
self.jnt:notify('playerNeedsUpgrade', self,
self:isNeedsUpgrade(), self:isUpgrading())
end
- -- Check if the player name has changed
- if oldInfo.name ~= self.info.name then
+ -- Check if the player name has changed & is defined
+ if self.info.name and oldInfo.name ~= self.info.name then
self.jnt:notify('playerNewName', self, self.info.name)
end
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
