Merge branch '2.3.x' into devel

airtime_mvc/public/js/airtime/schedule/add-show.js

@@ -406,10 +406,9 @@ function setAddShowEvents() {
             event.stopPropagation();
             event.preventDefault();
 
-            $("#schedule_calendar").removeAttr("style")
-                .fullCalendar('render');
-
 			$("#add-show-form").hide();
+            windowResize();
+
             $.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json){
                 $("#add-show-form")
                     .empty()
@@ -652,13 +651,14 @@ function windowResize() {
         var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100);
         var widthPercent = parseInt(calendarWidth)+"%";
         $("#schedule_calendar").css("width", widthPercent);
+	} else {
+        $("#schedule_calendar").css("width", 98.5+"%");
 	}
 	
 	// 200 px for top dashboard and 50 for padding on main content
 	// this calculation was copied from schedule.js line 326
 	var mainHeight = document.documentElement.clientHeight - 200 - 50;
-	$('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight)
-	$("#schedule_calendar").fullCalendar('render');
+	$('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight);
 	
 }
 

airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js

@@ -28,7 +28,11 @@ function openAddShowForm() {
             var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100);
             var widthPercent = parseInt(calendarWidth)+"%";
             $("#schedule_calendar").css("width", widthPercent);
-            $("#schedule_calendar").fullCalendar('render');
+
+            // 200 px for top dashboard and 50 for padding on main content
+            // this calculation was copied from schedule.js line 326
+            var mainHeight = document.documentElement.clientHeight - 200 - 50;
+            $('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight);
         }
         $("#schedule-show-what").show(0, function(){
             $add_show_name = $("#add_show_name");
@@ -372,6 +376,7 @@ function checkSCUploadStatus(){
             }else if(json.sc_id == "-3"){
                 $("span[id="+id+"]:not(.recording)").removeClass("progress").addClass("sc-error");
             }
+            setTimeout(checkSCUploadStatus, 5000);
         });
     });
 }
@@ -424,6 +429,7 @@ function getCurrentShow(){
                     $(this).remove("span[small-icon now-playing]");	
                 }    	
             });
+        setTimeout(getCurrentShow, 5000);
     }); 	
 }
 
@@ -564,8 +570,8 @@ function alertShowErrorAndReload(){
 
 preloadEventFeed();
 $(document).ready(function(){
-    setInterval( "checkSCUploadStatus()", 5000 );
-    setInterval( "getCurrentShow()", 5000 );
+    checkSCUploadStatus();
+    getCurrentShow();
 });
 
 var view_name;

airtime_mvc/public/js/airtime/schedule/schedule.js

@@ -93,6 +93,8 @@ function checkCalendarSCUploadStatus(){
         else if (json.sc_id == "-3") {
             span.removeClass("progress").addClass("sc-error");
         }
+
+        setTimeout(checkCalendarSCUploadStatus, 5000);
     }
     
     function checkSCUploadStatusRequest() {
@@ -328,7 +330,7 @@ function alertShowErrorAndReload(){
 }
 
 $(document).ready(function() {
-    setInterval(checkCalendarSCUploadStatus, 5000);
+    checkCalendarSCUploadStatus();
     
     $.contextMenu({
         selector: 'div.fc-event',