Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
This commit is contained in:
commit
9e0d14a8a7
9 changed files with 24 additions and 14 deletions
|
@ -376,6 +376,7 @@ function checkSCUploadStatus(){
|
|||
}else if(json.sc_id == "-3"){
|
||||
$("span[id="+id+"]:not(.recording)").removeClass("progress").addClass("sc-error");
|
||||
}
|
||||
setTimeout(checkSCUploadStatus, 5000);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
@ -428,6 +429,7 @@ function getCurrentShow(){
|
|||
$(this).remove("span[small-icon now-playing]");
|
||||
}
|
||||
});
|
||||
setTimeout(getCurrentShow, 5000);
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -568,8 +570,8 @@ function alertShowErrorAndReload(){
|
|||
|
||||
preloadEventFeed();
|
||||
$(document).ready(function(){
|
||||
setInterval( "checkSCUploadStatus()", 5000 );
|
||||
setInterval( "getCurrentShow()", 5000 );
|
||||
checkSCUploadStatus();
|
||||
getCurrentShow();
|
||||
});
|
||||
|
||||
var view_name;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue