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

Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

This commit is contained in:
denise 2013-05-28 11:25:50 -04:00
parent 85ee8aa0b2 c8f0c9505e
commit bb5f0c4301
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/public/js/airtime/dashboard/dashboard.js
View File

@ -262,14 +262,14 @@ function parseItems(obj){
if (obj.currentShow.length > 0) { if (obj.currentShow.length > 0) {
calcAdditionalShowData(obj.currentShow); calcAdditionalShowData(obj.currentShow);
currentShow = obj.currentShow;
} }
if (obj.nextShow.length > 0) { if (obj.nextShow.length > 0) {
calcAdditionalShowData(obj.nextShow); calcAdditionalShowData(obj.nextShow);
nextShow = obj.nextShow;
calculateTimeToNextShow(); calculateTimeToNextShow();
} }
currentShow = obj.currentShow;
nextShow = obj.nextShow;
var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime); var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime);
var date = new Date(); var date = new Date();