[Slim-Checkins] r10060 - in /branches/6.5/server: Changelog6.html HTML/Fishbone/html/ajax.js HTML/Fishbone/status_header.html

[kdf at svn.slimdevices.com]

Author: kdf
Date: Tue Sep 26 22:47:02 2006
New Revision: 10060

URL: http://svn.slimdevices.com?rev=10060&view=rev
Log:
Bug: 4228
Description: merge -r10058:10059 from trunk"


Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/HTML/Fishbone/html/ajax.js
    branches/6.5/server/HTML/Fishbone/status_header.html

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10060&r1=10059&r2=10060&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Tue Sep 26 22:47:02 2006
@@ -21,6 +21,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4192">#4192</a> - IE doesn't refresh status</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4213">#4213</a> - Slimserver can crash due to display being deleted from client object at forget time</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4221">#4221</a> - 6.5 crashes on artist breadcrumb</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4228">#4228</a> - Fishbone skin status doesn't update from an empty playlist</li>
 	<ul>
 </ul>
 

Modified: branches/6.5/server/HTML/Fishbone/html/ajax.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/html/ajax.js?rev=10060&r1=10059&r2=10060&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/html/ajax.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/ajax.js Tue Sep 26 22:47:02 2006
@@ -190,10 +190,11 @@
 	var a = rExp.exec(myString);
 	var newsong = 1;
 
-	if (force != 1) {
+	if (force != 1 && !(parsedData['songtitleid'] && $('nowplaying').style.display == 'none')) {
 		if (a == null || a[1] == parsedData['songtitleid']) {newsong = 0;}
 	}
 	
+	//alert([newsong,parsedData['songtitleid'] ,$('nowplaying').style.display]);
 	var elems = ['thissongnum', 'playtextmode', 'songcount'];
 	if (newsong) {
 		elems.push('songtitle');
@@ -257,12 +258,12 @@
 	
 	// refresh href content
 	if (newsong) {
-		refreshHrefElement('albumhref',parsedData['albumid'],"album.id=");
-		refreshHrefElement('coverhref',parsedData['albumid'],"album.id=");
-		refreshHrefElement('removealbumhref',parsedData['album'],"p4=");
-		refreshHrefElement('removeartisthref',parsedData['artist'],"p3=");
-		refreshHrefElement('songtitlehref',parsedData['songtitleid'],"item=");
-		refreshHrefElement('zaphref',parsedData['thissongnum']-1,"p2=");
+		refreshHrefElement('albumhref', parsedData['albumid'],"album.id=");
+		refreshHrefElement('coverhref', parsedData['albumid'],"album.id=");
+		refreshHrefElement('removealbumhref', parsedData['album'],"p4=");
+		refreshHrefElement('removeartisthref', parsedData['artist'],"p3=");
+		refreshHrefElement('songtitlehref', parsedData['songtitleid'],"item=");
+		refreshHrefElement('zaphref', parsedData['thissongnum']-1,"p2=");
 		currentID = parsedData['songtitleid'];
 	}
 

Modified: branches/6.5/server/HTML/Fishbone/status_header.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/status_header.html?rev=10060&r1=10059&r2=10060&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/status_header.html (original)
+++ branches/6.5/server/HTML/Fishbone/status_header.html Tue Sep 26 22:47:02 2006
@@ -134,7 +134,7 @@
 			<div id="nowplaying" [% IF NOT currentsong %]style="display:none;"[% END %]>
 				<div class="label">[% IF modeplay  %][% status = "PLAYING"    %][% END %][% IF modepause %][% status = "PAUSED_ON"  %][% END %][% IF modestop  %][% status = "STOPPED_ON" %][% END %]
 				<span id="playtextmode">[% IF currentsong %][% status | string %][% END %]</span>
-				<span id="thissongnum">[% IF currentsong %][% currentsong %][% END %]</span><span id="outof">&nbsp;[% "OUT_OF" | string %]&nbsp;</span><span id="songcount">[% IF songcount %][% songcount %][% END %]</span>&nbsp;<span id="zaphref">[% IF currentsong %]<a class="label" href="[% statusroot %]?p0=playlist&amp;p1=zap&amp;p2=[% thissongnum %]&amp;player=[% playerURI %]" title='Move to Zapped playlist'>[zap]</a>[% END %]</span>[% IF currentsong %][% "COLON" | string %][% END %]</div>
+				<span id="thissongnum">[% IF currentsong %][% currentsong %][% END %]</span><span id="outof">&nbsp;[% "OUT_OF" | string %]&nbsp;</span><span id="songcount">[% IF songcount %][% songcount %][% END %]</span>&nbsp;<span id="zaphref"><a class="label" href="[% statusroot %]?p0=playlist&amp;p1=zap&amp;p2=[% thissongnum %]&amp;player=[% playerURI %]" title='Move to Zapped playlist'>[zap]</a></span>[% "COLON" | string %]</div>
 				<div id="songtitlehref" class="currentSongData"><a class="songtitle" [% songinfoHRef %] target="browser"><span id="songtitle">[% songtitle %]</span></a>
 				&nbsp;<span id="duration">[% IF itemobj.duration %]([% itemobj.duration | html %])[% END %]</span>&nbsp;<span id="bitrate">[% IF bitrate %]([% bitrate %])[% END %]</span></div>