fixed time bug which introduced by previous workaround

[comingnext] / comingNext / index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index 30d91bc3643ffbc6d5f3c2b07c5bd76f5cf9cb41..992da2376cbf14ebb9eb6af2fe29ed771301863c 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -106,6 +106,7 @@ var reloadInterval = 6 * 60 * 60 * 1000; // = 6 hours; time interval for reloadi
 var errorOccured = false;\r
 var entryLists = null; // stores all fetched calendar entries until data is refreshed\r
 var statupSuccessful = false; // indicates if everything started up wihtout errors. If we detect an error after that, it might just be a temporary problem e.g. by a backup process.\r
+var use12hoursTimeFormat = false; // defines how time should be formated: 19:00 or 07:00 pm\r
 \r
 // vars for daylight saving time\r
 var summertime = false; // true, if current date is in summer, false if in winter\r
@@ -491,6 +492,10 @@ function parseDate(dateString)
                if (dateArr.length == 6 && dateArr[5].toLowerCase() == 'am' && hours == 12) \r
                        hours = 0;\r
                \r
+               // remember if date was formated using 12h time format, we need to use this information later when formating time\r
+               if (dateArr.length == 6 && (dateArr[5].toLowerCase() == 'am' || dateArr[5].toLowerCase() == 'pm'))\r
+                       use12hoursTimeFormat = true;\r
+\r
                result = new Date(year, month - 1, day, hours, minutes, seconds);\r
        }\r
        \r
@@ -592,6 +597,25 @@ function formatTime(date)
        var time = date.toLocaleTimeString().replace(/[\.:]00/, ''); // remove seconds from string\r
        if (time.replace(/\./, ':').split(':')[0].length < 2)\r
                time = '0' + time;\r
+\r
+       // workaround for bug introduced by Anna firmwares, which causes Date().toLocaleTimeString() to no longer return time in 12h format even though this has been defined in system settings\r
+       if (use12hoursTimeFormat && time.toLowerCase().indexOf('am') == -1 && time.toLowerCase().indexOf('pm') == -1) { \r
+               var hour = date.getHours();\r
+               var minute = date.getMinutes();\r
+               var ap = "AM";\r
+               if (hour > 11)\r
+                       ap = "PM";\r
+               if (hour > 12)\r
+                       hour = hour - 12;\r
+               if (hour == 0)\r
+                       hour = 12;\r
+               if (hour < 10)\r
+                       hour = "0" + hour;\r
+               if (minute < 10)\r
+                       minute = "0" + minute;\r
+               time = hour + ":" + minute + " " + ap;\r
+       }\r
+       \r
        if (config['showNowAsText'].Value && date.getTime() == now.getTime())\r
                time = '<span class="now">' + config['nowText'].Value + '</span>';\r
        return time;\r
@@ -611,7 +635,7 @@ function updateData()
                // This usually happens when a backup is being made.\r
                // Retry the next time updateData() is called by \r
                // resetting errorOccured\r
-               log('updateData(): listCalendars() failed, trying again laster...');\r
+               log('updateData(): listCalendars() failed, trying again later...');\r
                cacheEntriesHtml = ''; // make sure we replace the currently shown error message on the next update\r
                errorOccured = false;\r
                return;\r