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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
James 2011-08-18 13:54:17 -04:00
commit 38256de606
22 changed files with 199 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,8 @@ var currentElem;
var serverUpdateInterval = 5000;
var uiUpdateInterval = 200;
var timezoneOffset = 0;
//set to "development" if we are developing :). Useful to disable alerts
//when entering production mode.
var APPLICATION_ENV = "";
@ -169,7 +171,7 @@ function updatePlaybar(){
}
/* Column 2 update */
$('#time').text(convertDateToHHMMSS(estimatedSchedulePosixTime));
$('#time').text(convertDateToHHMMSS(estimatedSchedulePosixTime + timezoneOffset));
}
function calcAdditionalData(currentItem){
@ -209,7 +211,7 @@ function parseItems(obj){
calcAdditionalShowData(obj.nextShow);
var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime);
schedulePosixTime += parseInt(obj.timezoneOffset)*1000;
timezoneOffset = parseInt(obj.timezoneOffset)*1000;
var date = new Date();
localRemoteTimeOffset = date.getTime() - schedulePosixTime;
}