From d2bbc39f1052b84893e71dee0a12f756df5835ca Mon Sep 17 00:00:00 2001
From: Paul Moore <pcmoore@umich.edu>
Date: Tue, 8 Sep 2009 11:01:24 -0400
Subject: [PATCH] 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.
---
 comingNext/index.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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