Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cc-2167: now playing view with recording shows a gap

Browse source 
-implemented
This commit is contained in:
mkonecny 2011-05-05 16:45:13 -04:00
parent 1337efcdcd
commit 9638f6dd3e
5 changed files with 24 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
View file

@ -178,6 +178,18 @@ function createDataGrid(){
nCell.innerHTML = "Gap until show end: " + gapTime + " seconds";
nGroup.appendChild(nCell);
nTrs[i].parentNode.replaceChild(nGroup, nTrs[i]);
} else if ( sType.indexOf("r") != -1 ){
//gap row found
var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[1];
var nGroup = document.createElement('tr');
var nCell = document.createElement('td');
nCell.colSpan = iColspan;
nCell.className = "record";
nCell.innerHTML = "Recording show \"" + showName + "\"";
nGroup.appendChild(nCell);
nTrs[i].parentNode.replaceChild(nGroup, nTrs[i]);
}
}

6
airtime_mvc/public/js/playlist/playlist.js
View file

@ -139,7 +139,11 @@ function updatePlaybar(){
}
if (currentSong.length > 0){
$('#current').text(getTrackInfo(currentSong[0]));
}
} else if (currentShow.length > 0){
if (currentShow[0].record == "1"){
$('#current').html("Current: <span style='color:red; font-weight:bold'>Recording</span>");
}
}
if (nextSongs.length > 0){
$('#next').text(getTrackInfo(nextSongs[0]));
$('#next-length').text(convertToHHMMSSmm(nextSongs[0].songLengthMs));