Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
Naomi 2011-01-31 13:50:57 -05:00
commit 101bdac481
3 changed files with 5 additions and 2 deletions

View file

@ -188,6 +188,8 @@ function calcAdditionalData(currentItem, bUpdateGlobalValues){
function parseItems(obj){
var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime);
$('#time-zone').text(obj.timezone);
previousSongs = obj.previous;
currentSong = obj.current;