From a4fb63afcfd99593b783716fbb1a0a88d8db02c9 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 21 Sep 2011 10:16:48 -0400 Subject: [PATCH] CC-2856: duration was is always fixed to 1h - fixed --- airtime_mvc/public/js/airtime/schedule/add-show.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index c9f676148..eaa7d44fa 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -374,16 +374,16 @@ function setAddShowEvents() { function calculateDuration(endDateTime, startDateTime){ var duration; var durationSeconds = (endDateTime.getTime() - startDateTime.getTime())/1000; - if(durationSeconds != 0){ + if(isNaN(durationSeconds)){ + duration = '1h'; + } + else if(durationSeconds != 0){ var durationHour = parseInt(durationSeconds/3600, 10); var durationMin = parseInt((durationSeconds%3600)/60, 10); duration = (durationHour == 0 ? '' : durationHour+'h'+' ')+(durationMin == 0 ? '' : durationMin+'m'); }else{ duration = '0m'; } - if(isNaN(duration)){ - duration = '1h'; - } $('#add_show_duration').val(duration); }