Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2011-09-22 11:48:07 -04:00 · 2011-09-22 11:48:07 -04:00 · b3654c62bc
commit b3654c62bc
parent 73dc4b851d 4e79a88adc
22 changed files with 524 additions and 152 deletions
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@ -381,6 +381,9 @@ function setAddShowEvents() {
 		}else{
 			duration = '0m';
 		}
+		if(isNaN(duration)){
+		    duration = '1h';
+		}
 		$('#add_show_duration').val(duration);
 	}