javascript: Fixes to the "today" logic

There were several places that made assumptions about specific customization
settings when determining if the event date was occurring today.  This patch
creates a new funtion "isToday()" to correct and consolidate the today logic.

diff --git a/comingNext/index.html b/comingNext/index.html
index 6379fd99b5445edea7d5cf46f11ce009b8a5f447..3684b84ff951567c3d15de01e88c6dfc22d2d941 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -63,6 +63,13 @@ function error(message)
        document.getElementById("calendarList").innerHTML = 'Error: ' + message;\r
 }\r
 \r
+function isToday(date)\r
+{\r
+       if (date.getDate() == now.getDate() && date.getMonth() == now.getMonth())\r
+               return true;\r
+       return false;\r
+}\r
+\r
 function collectLocales()\r
 {\r
        var tmpyear = ((panelNum == 0) ? 2000 : 2001);\r
@@ -246,7 +253,7 @@ function formatDate(date, format)
        while (day.length < 2) { day = '0' + day; }\r
        while (month.length < 2) { month = '0' + month; }\r
 \r
-       if (showTodayAsText && now.getDate() == date.getDate() && now.getMonth() == date.getMonth())\r
+       if (showTodayAsText && isToday(date))\r
                return '<span class="today">' + todayText + '</span>';\r
 \r
        var dateArr = format.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');\r
@@ -464,25 +471,18 @@ function updateData()
                                        var time = formatTime(date);\r
                                        var dateStr = formatDate(date, entryDate);\r
                                        if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {\r
-                                               // decide if we want to leave off the weekday\r
-                                               if (dateStr.search(/Today/) != -1)\r
+                                               if (isToday(date))\r
                                                        entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';\r
                                                else\r
                                                        entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td colspan="2">';\r
                                        } else if (entry.Type == 'Meeting') {\r
                                                if (showCombinedDateTime) {\r
-                                                       if (now.getDate() == date.getDate() && now.getMonth() == date.getMonth())\r
+                                                       if (isToday(date))\r
                                                                entriesHtml += '<td colspan="4"><span class="today">' + time + '</span> ';\r
-                                                       else {\r
-                                                               // decide if we want to leave off the weekday\r
-                                                               if (dateStr.search(/Today/) != -1)\r
-                                                                       entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';\r
-                                                               else\r
-                                                                       entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td colspan="2">';\r
-                                                       }\r
+                                                       else\r
+                                                               entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td colspan="2">';\r
                                                } else {\r
-                                                       // decide if we want to leave off the weekday\r
-                                                       if (dateStr.search(/Today/) != -1)\r
+                                                       if (isToday(date))\r
                                                                entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> <span class="time">' + time + '</span> ';\r
                                                        else\r
                                                                entriesHtml += '<td><span class="weekDay">' + weekDay + '</span></td><td><span class="date">' + dateStr + '</span></td><td width="1px"><span class="time">' + time + '</span></td><td>';\r