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

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

Browse source
This commit is contained in:
Naomi Aro 2013-05-28 13:12:15 -04:00
commit 96eefee407
2 changed files with 13 additions and 10 deletions
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) {
calcAdditionalShowData(obj.currentShow);
currentShow = obj.currentShow;
}
if (obj.nextShow.length > 0) {
calcAdditionalShowData(obj.nextShow);
nextShow = obj.nextShow;
calculateTimeToNextShow();
}
currentShow = obj.currentShow;
nextShow = obj.nextShow;
var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime);
var date = new Date();