From 0f5fc005443e51e4a8ca481a2c4eb66e751742cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Miguel=20Alm=C3=A1nzar?= <ruisu15@gmail.com>
Date: Sat, 15 Jun 2013 13:57:08 -0400
Subject: [PATCH] only convert to 24 hour format if input is in correct format

---
 dashboard-ui/scripts/edititemmetadata.js | 30 ++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 3f1f7152f1..e74fd9c947 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -273,19 +273,25 @@
     function convertTo24HourFormat(time) {
         if (time == "")
             return time;
-        var hours = Number(time.match(/^(\d+)/)[1]);
-        var minutes = Number(time.match(/:(\d+)/)[1]);
-        var ampm = time.match(/\s(.*)$/)[1];
-        ampm = ampm.toUpperCase();
-        if (ampm == "PM" && hours < 12) hours = hours + 12;
-        if (ampm == "AM" && hours == 12) hours = 0;
-        var sHours = hours.toString();
-        var sMinutes = minutes.toString();
-        if (hours < 10) sHours = "0" + sHours;
-        if (minutes < 10) sMinutes = "0" + sMinutes;
-        return sHours + ":" + sMinutes;
+        var match = time.match(/^(\d+):(\d+)(.*)$/);
+        if (match)
+        {
+            var hours = Number(match[1]);
+            var minutes = Number(match[2]);
+            var ampm = $.trim(match[3]);
+            ampm = ampm.toUpperCase();
+            if (ampm == "PM" && hours < 12) hours = hours + 12;
+            if (ampm == "AM" && hours == 12) hours = 0;
+            var sHours = hours.toString();
+            var sMinutes = minutes.toString();
+            if (hours < 10) sHours = "0" + sHours;
+            if (minutes < 10) sMinutes = "0" + sMinutes;
+            return sHours + ":" + sMinutes;
+        } else {
+            return time;
+        }
     }
-    
+
     function convertTo12HourFormat(time) {
         if (time == "")
             return time;