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

-bug fixes

This commit is contained in:
mkonecny 2011-02-09 20:13:30 -05:00
parent bf4549c86d
commit 210a71c213
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/playlist/nowplayingdatagrid.js
View File

@ -108,7 +108,8 @@ function updateDataTable(){
var table = $('#nowplayingtable').dataTable(); var table = $('#nowplayingtable').dataTable();
table.fnClearTable(false); table.fnClearTable(false);
table.fnAddData(datagridData.rows); table.fnAddData(datagridData.rows, false);
table.fnDraw(true);
} }
@ -143,7 +144,7 @@ $(document).ready(function() {
$("#datepicker").datepicker({ $("#datepicker").datepicker({
onSelect: function(dateText, inst) onSelect: function(dateText, inst)
{ updateData();}}); { getData();}});
$("#datepicker").datepicker("setDate", new Date()); $("#datepicker").datepicker("setDate", new Date());
} else { } else {
$('#day_view').click(function(){redirect('/Nowplaying/day-view')}); $('#day_view').click(function(){redirect('/Nowplaying/day-view')});

5
public/js/playlist/playlist.js
View File

@ -77,14 +77,15 @@ function nextShowStart(){
/* Called every "uiUpdateInterval" mseconds. */ /* Called every "uiUpdateInterval" mseconds. */
function updateProgressBarValue(){ function updateProgressBarValue(){
var showPercentDone = 0;
if (currentShow.length > 0){ if (currentShow.length > 0){
var showPercentDone = (estimatedSchedulePosixTime - currentShow[0].showStartPosixTime)/currentShow[0].showLengthMs*100; showPercentDone = (estimatedSchedulePosixTime - currentShow[0].showStartPosixTime)/currentShow[0].showLengthMs*100;
if (showPercentDone < 0 || showPercentDone > 100){ if (showPercentDone < 0 || showPercentDone > 100){
showPercentDone = 0; showPercentDone = 0;
currentShow = new Array(); currentShow = new Array();
} }
$('#progress-show').attr("style", "width:"+showPercentDone+"%");
} }
$('#progress-show').attr("style", "width:"+showPercentDone+"%");
var songPercentDone = 0; var songPercentDone = 0;
if (currentSong.length > 0){ if (currentSong.length > 0){