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

airtime_mvc/public/js/airtime/common/common.js

@@ -30,6 +30,21 @@ var i18n_months = [
     $.i18n._("December")
 ];
 
+var i18n_months_short = [
+    $.i18n._("Jan"),
+    $.i18n._("Feb"),
+    $.i18n._("Mar"),
+    $.i18n._("Apr"),
+    $.i18n._("May"),
+    $.i18n._("Jun"),
+    $.i18n._("Jul"),
+    $.i18n._("Aug"),
+    $.i18n._("Sep"),
+    $.i18n._("Oct"),
+    $.i18n._("Nov"),
+    $.i18n._("Dec")
+];
+
 var i18n_days_short = [
     $.i18n._("Su"),
     $.i18n._("Mo"),

airtime_mvc/public/js/airtime/playouthistory/historytable.js

@@ -466,6 +466,13 @@ var AIRTIME = (function(AIRTIME) {
     		    }
     		];
     	
+    	//set the locale names for the bootstrap calendar.
+    	$.fn.datetimepicker.dates = {
+    		daysMin: i18n_days_short,
+    		months: i18n_months,
+    		monthsShort: i18n_months_short
+    	};
+    	
     	
     	$historyContentDiv = $("#history_content");
     	

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

@@ -481,6 +481,13 @@ function setAddShowEvents() {
 
             event.preventDefault();
 
+            //when editing a show, the record option is disabled
+            //we have to enable it to get the correct value when
+            //we call serializeArray()
+            if (form.find("#add_show_record").attr("disabled", true)) {
+                form.find("#add_show_record").attr("disabled", false);
+            }
+
 			var data = $("form").serializeArray();
 
             var hosts = $('#add_show_hosts-element input').map(function() {
@@ -504,7 +511,7 @@ function setAddShowEvents() {
             });
 
             var action = baseUrl+"Schedule/"+String(addShowButton.attr("data-action"));
-            
+
             $.post(action, {format: "json", data: data, hosts: hosts, days: days}, function(json){
                 //addShowButton.removeClass("disabled");
                 $('#schedule-add-show').unblock();

airtime_mvc/public/js/airtime/showbuilder/builder.js

@@ -178,7 +178,12 @@ var AIRTIME = (function(AIRTIME){
     };
     
     mod.checkToolBarIcons = function() {
-        AIRTIME.library.checkAddButton();
+    	
+    	//library may not be on the page.
+    	if (AIRTIME.library !== undefined) {
+    		AIRTIME.library.checkAddButton();
+    	}
+        
         mod.checkSelectButton();
         mod.checkTrimButton();
         mod.checkDeleteButton();

airtime_mvc/public/js/airtime/showbuilder/main_builder.js

@@ -186,7 +186,11 @@ AIRTIME = (function(AIRTIME) {
         AIRTIME.showbuilder.fnServerData.start = oRange.start;
         AIRTIME.showbuilder.fnServerData.end = oRange.end;
 
-        AIRTIME.library.libraryInit();
+        //the user might not have the library on the page (guest user)
+        if (AIRTIME.library !== undefined) {
+        	AIRTIME.library.libraryInit();
+        }
+        
         AIRTIME.showbuilder.builderDataTable();
         setWidgetSize();
 

airtime_mvc/public/js/bootstrap-datetime/bootstrap-datetimepicker.js

@@ -44,6 +44,9 @@
     constructor: DateTimePicker,
 
     init: function(element, options) {
+    	
+      dates = $.fn.datetimepicker.dates;
+    	
       var icon;
       if (!(options.pickTime || options.pickDate))
         throw new Error('Must choose at least one picker');
@@ -340,7 +343,7 @@
       var dowCnt = this.weekStart;
       var html = $('<tr>');
       while (dowCnt < this.weekStart + 7) {
-        html.append('<th class="dow">' + dates[this.language].daysMin[(dowCnt++) % 7] + '</th>');
+        html.append('<th class="dow">' + dates.daysMin[(dowCnt++) % 7] + '</th>');
       }
       this.widget.find('.datepicker-days thead').append(html);
     },
@@ -349,7 +352,7 @@
       var html = '';
       var i = 0
       while (i < 12) {
-        html += '<span class="month">' + dates[this.language].monthsShort[i++] + '</span>';
+        html += '<span class="month">' + dates.monthsShort[i++] + '</span>';
       }
       this.widget.find('.datepicker-months td').append(html);
     },
@@ -373,7 +376,7 @@
       this.widget.find('.datepicker-years').find('.disabled').removeClass('disabled');
 
       this.widget.find('.datepicker-days th:eq(1)').text(
-        dates[this.language].months[month] + ' ' + year);
+        dates.months[month] + ' ' + year);
 
       var prevMonth = UTCDate(year, month-1, 28, 0, 0, 0, 0);
       var day = DPGlobal.getDaysInMonth(
@@ -1103,7 +1106,6 @@
   $.fn.datetimepicker.Constructor = DateTimePicker;
   var dpgId = 0;
   var dates = $.fn.datetimepicker.dates = {
-    en: {
       days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
         "Friday", "Saturday", "Sunday"],
       daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
@@ -1112,7 +1114,6 @@
         "July", "August", "September", "October", "November", "December"],
       monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
         "Aug", "Sep", "Oct", "Nov", "Dec"]
-    }
   };
 
   var dateFormatComponents = {

airtime_mvc/public/js/waveformplaylist/config.js

@@ -3,6 +3,8 @@
     A container object (ex a div) must be passed in, the playlist will be built on this element.
 */
 
+var waveformPlaylistAudio = waveformPlaylistAudio || new (window.AudioContext || window.webkitAudioContext);
+
 var Config = function(params) {
 
         var that = this,
@@ -10,7 +12,7 @@ var Config = function(params) {
 
         defaultParams = {
 
-            ac: new (window.AudioContext || window.webkitAudioContext),
+            ac: waveformPlaylistAudio,
 
             resolution: 4096, //resolution - samples per pixel to draw.
             timeFormat: 'hh:mm:ss.uuu',