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

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

This commit is contained in:
Albert Santoni 2013-10-04 14:15:32 -04:00
parent 7b1cd5c908 548d3eef0e
commit 7cca01ab08
1 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View File

@ -217,7 +217,7 @@ function viewDisplay( view ) {
} }
function eventRender(event, element, view) { function eventRender(event, element, view) {
$(element).attr("id", "fc-show-instance-"+event.id); $(element).addClass("fc-show-instance-"+event.id);
$(element).attr("data-show-id", event.showId); $(element).attr("data-show-id", event.showId);
$(element).attr("data-show-linked", event.linked); $(element).attr("data-show-linked", event.linked);
$(element).data("event", event); $(element).data("event", event);
@ -412,13 +412,13 @@ function checkSCUploadStatus(){
$.post(url, {format: "json", id: id, type:"show"}, function(json){ $.post(url, {format: "json", id: id, type:"show"}, function(json){
if (json.sc_id > 0){ if (json.sc_id > 0){
$("#fc-show-instance-"+id) $(".fc-show-instance-"+id)
.find(".progress") .find(".progress")
.removeClass("progress") .removeClass("progress")
.addClass("soundcloud"); .addClass("soundcloud");
} }
else if (json.sc_id == "-3"){ else if (json.sc_id == "-3"){
$("#fc-show-instance-"+id) $(".fc-show-instance-"+id)
.find(".progress") .find(".progress")
.removeClass("progress") .removeClass("progress")
.addClass("sc-error"); .addClass("sc-error");
@ -428,59 +428,39 @@ function checkSCUploadStatus(){
}); });
}); });
} }
/** This function adds and removes the current /** This function adds and removes the current
* show icon * show icon
*/ */
function getCurrentShow(){ function getCurrentShow() {
var url = baseUrl+'Schedule/get-current-show/format/json',
id, var url = baseUrl+'Schedule/get-current-show/format/json';
$el;
$.post(url, {format: "json"}, function(json) { function addNowPlaying(json) {
var $el,
span = '<span class="small-icon now-playing"></span>';
$(".now-playing").remove();
if (json.current_show === true) { if (json.current_show === true) {
$el = $("div[class*=fc-event-time]");
if (view_name === 'agendaDay' || view_name === 'agendaWeek') { $el = $(".fc-show-instance-"+json.si_id);
/* Need to remove now-playing class because if user if (view_name === 'agendaDay' || view_name === 'agendaWeek') {
* is switching from week view to day view (and vice versa)
* the icon may already be there from previous view $el.find(".fc-event-time").before(span);
*/ }
$el.siblings().remove("span.now-playing"); else if (view_name === 'month') {
if (!$el.siblings().hasClass("small-icon now-playing")) {
if ($el.siblings().hasClass("small-icon recording")) { $el.find(".fc-event-title").after(span);
}
/* Without removing recording icon, the now playing
* icon will overwrite it.
*/
$el.siblings().remove("span.recording");
$el.before('<span class="small-icon now-playing"></span><span class="small-icon recording"></span>');
} else if ($el.siblings().hasClass("small-icon rebroadcast")) {
/* Without removing rebroadcast icon, the now playing
* icon will overwrite it.
*/
$el.siblings().remove("span.rebroadcast");
$el.before('<span class="small-icon now-playing"></span><span class="small-icon rebroadcast"></span>');
} else {
$el.before('<span class="small-icon now-playing"></span>');
}
}
} else if (view_name === 'month') {
if (!$("span[class*=fc-event-title]").siblings().hasClass("now-playing")) {
$("span[class*=fc-event-title]").after('<span class="small-icon now-playing"></span>');
}
}
} }
//remove icon from shows that have ended
$(".now-playing").each(function(){
id = $(this).parents("div.fc-event").data("event").id;
if (id != json.si_id) {
$(this).remove("span.now-playing");
}
});
setTimeout(getCurrentShow, 5000); setTimeout(getCurrentShow, 5000);
}); }
$.post(url, {format: "json"}, addNowPlaying);
} }
function addQtipsToIcons(ele, id){ function addQtipsToIcons(ele, id){