[Slim-Checkins] r9362 - in /branches/6.5/server/HTML/Fishbone:
html/ajax.js html/scripts.js index.html playlist.html skin.css
kdf at svn.slimdevices.com
kdf at svn.slimdevices.com
Fri Sep 1 22:44:21 PDT 2006
Author: kdf
Date: Fri Sep 1 22:44:19 2006
New Revision: 9362
URL: http://svn.slimdevices.com?rev=9362&view=rev
Log:
Bug: n/a
Description: merge -r9359:9360 from trunk
Modified:
branches/6.5/server/HTML/Fishbone/html/ajax.js
branches/6.5/server/HTML/Fishbone/html/scripts.js
branches/6.5/server/HTML/Fishbone/index.html
branches/6.5/server/HTML/Fishbone/playlist.html
branches/6.5/server/HTML/Fishbone/skin.css
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=9362&r1=9361&r2=9362&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/html/ajax.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/ajax.js Fri Sep 1 22:44:19 2006
@@ -103,7 +103,7 @@
getStatusData(param + "&player="+player+"&ajaxRequest=1", refreshPlayControls);
}
-function refreshPlayControls(theData) {
+function refreshPlayControls(theData,force) {
var parsedData = fillDataHash(theData);
var controls = ['stop', 'play', 'pause'];
@@ -154,7 +154,7 @@
}
if (parsedData['playmode'] == 1) {
- if (!mp) {refreshInfo(parsedData,1);}
+ refreshInfo(parsedData,force);
mp = 1;
} else {
mp = 0;
@@ -180,7 +180,7 @@
if (newsong) {
elems.push('songtitle');
refreshElement('songtitle', parsedData['songtitle']);
- refreshPlaylist(player);
+ playlistChecker();
}
if (parsedData['streamtitle']) {
@@ -288,6 +288,7 @@
if(parsedData['playermodel']) {
$('logoimage' + curstyle).src = '[% webroot %]html/images/' + parsedData['playermodel'] + '_logo.small' + curstyle + '.gif';
}
+ playlistChecker();
}
return true;
}
@@ -310,7 +311,10 @@
var newloc = plloc.protocol + '//' + plloc.host + plloc.pathname
+ plloc.search.replace(/&d=\d+/, '') + '&d=' + new Date().getTime() + plloc.hash;
+
newloc=newloc.replace(playerExp, '=' + newPlayer);
+ newloc=newloc.replace(/&start=\d+&/, '&');
+ newloc=newloc.replace(/#\d+/, '#currentsong');
plloc.replace(newloc);
//DumperPopup([plloc,plloc.search.replace(playerExp, '='+newPlayer),plloc.search.replace(/&d=\d+/, '')]);
}
@@ -320,6 +324,34 @@
}
}
+var last;
+var first;
+function currentSong(theData) {
+ var parsedData = fillDataHash(theData);
+
+ var doc = parent.playlist.document;
+ var found = 1;
+
+ if (first == null || first == parsedData['first_item']) {
+ first = parsedData['first_item'];
+
+ for (var i = parsedData['first_item']; i <= parsedData['last_item']; i++) {
+
+ if (i == parsedData['currentsongnum']) {
+ doc.getElementById('playlistitem' + i).className = "currentListItem";
+ found = 0;
+ } else {
+ doc.getElementById('playlistitem' + i).className = "browsedbListItem";
+ }
+ }
+ } else {
+ first = parsedData['first_item'];
+ playlistChecker(first);
+ }
+
+ doc.location.hash = parsedData['currentsongnum'];
+}
+
function refreshAll(theData,force) {
var parsedData = fillDataHash(theData);
@@ -327,7 +359,7 @@
refreshVolume(parsedData);
}
- refreshPlayControls(parsedData);
+ refreshPlayControls(parsedData,force);
refreshInfo(parsedData,force);
refreshState(parsedData);
}
@@ -336,6 +368,7 @@
function refreshNewPlayer(theData) {
var parsedData = fillDataHash(theData);
refreshAll(parsedData,1);
+ refreshInfo(parsedData,force);
}
function fillDataHash(theData) {
@@ -347,4 +380,17 @@
returnData = parseData(myData);
}
return returnData;
-}
+}
+
+function playlistChecker(start) {
+ var prev_url = url;
+ url = 'playlist.html';
+ var args = 'player='+player+'&ajaxRequest=1';
+ if(start != null && start != '') {
+ //alert([start != '', start == null]);
+ refreshPlaylist();
+ args = args + "&start="+start;
+ }
+ getStatusData(args, currentSong);
+ url = prev_url;
+}
Modified: branches/6.5/server/HTML/Fishbone/html/scripts.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/html/scripts.js?rev=9362&r1=9361&r2=9362&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/html/scripts.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/scripts.js Fri Sep 1 22:44:19 2006
@@ -136,7 +136,7 @@
inc = 0;
if (!mp) {
_progressAt = 0;
- refreshPlaylist();
+ //refreshPlaylist();
}
}
Modified: branches/6.5/server/HTML/Fishbone/index.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/index.html?rev=9362&r1=9361&r2=9362&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/index.html (original)
+++ branches/6.5/server/HTML/Fishbone/index.html Fri Sep 1 22:44:19 2006
@@ -22,7 +22,7 @@
document.write('<frameset name="player_frame" ID="player_frame" border="0" frameborder="no" framespacing="0" rows="260,*">');
document.write('<frame ID="status" name="status" scrolling="no" src="status_header.html?player'+cPlayer+'">');
- document.write('<frame ID="playlist" name="playlist" src="playlist.html?player'+cPlayer+'">');
+ document.write('<frame ID="playlist" name="playlist" src="playlist.html?player='+cPlayer+'">');
document.write('<\/frameset>');
document.write('<\/frameset>');
document.close();
Modified: branches/6.5/server/HTML/Fishbone/playlist.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/playlist.html?rev=9362&r1=9361&r2=9362&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/playlist.html (original)
+++ branches/6.5/server/HTML/Fishbone/playlist.html Fri Sep 1 22:44:19 2006
@@ -1,9 +1,14 @@
+[%- IF ajaxRequest -%]
+<pre>
+ [% PROCESS ajaxRequest.txt page = 'playlist' %]
+</pre>
+[%- ELSE -%]
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
[% PROCESS customheader.html %]
</head>
- <body bgcolor="#000000" marginwidth="0" marginheight="0" topmargin="0" leftmargin="0" onload="javascript:to_currentsong()">
+ <body bgcolor="#000000" marginwidth="0" marginheight="0" topmargin="0" leftmargin="0" onload="javascript:to_currentsong();">
[% IF playercount == '0' %]
[% ELSIF not playlist_items %]<div class="list"><a name="currentsong"></a></p>[% "EMPTY" | string %]</div>
[% ELSE %]
@@ -27,3 +32,4 @@
[% END %]
</body>
</html>
+[% END %]
Modified: branches/6.5/server/HTML/Fishbone/skin.css
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/skin.css?rev=9362&r1=9361&r2=9362&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/skin.css (original)
+++ branches/6.5/server/HTML/Fishbone/skin.css Fri Sep 1 22:44:19 2006
@@ -734,11 +734,14 @@
color : white ! important;
}
-#currentListItem
+.currentListItem
{
background:#333;
border-top:solid 1px #EE3823;
border-bottom:solid 1px #EE3823;
+ position: relative;
+ padding: 0px;
+ padding-right: 100px;
}
.listinghead
More information about the checkins
mailing list