CC-3068: Day/Week view and Month view under Calendar page have different ideas about what day is today

-Fixed
This commit is contained in:
Martin Konecny 2011-11-18 17:07:12 -05:00
parent 34252d680a
commit 9bbf1fda17
3 changed files with 5250 additions and 10 deletions

View file

@ -1,11 +1,28 @@
Before you overwrite fullcalendar.js, note that we have changed one line Before you overwrite fullcalendar.js, note that we have changed a few lines
of this file. in this file.
Running a diff between the original fullcalendar.js and our modified one: Running a diff between the original fullcalendar.js and our modified one:
$diff -u fullcalendar_original.js fullcalendar.js martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js
--- fullcalendar_original.js 2011-04-09 17:13:15.000000000 -0400 --- fullcalendar_orig.js 2011-04-09 17:13:15.000000000 -0400
+++ fullcalendar.js 2011-08-19 11:58:49.672894583 -0400 +++ fullcalendar.js 2011-11-18 17:03:57.000000000 -0500
@@ -1,6 +1,6 @@
/**
* @preserve
- * FullCalendar v1.5.1
+ * FullCalendar v1.5.1-CUSTOM (Changes by Martin Konecny -added primitive support for timezones)
* http://arshaw.com/fullcalendar/
*
* Use fullcalendar.css for basic styling.
@@ -227,7 +227,7 @@
var absoluteViewElement;
var resizeUID = 0;
var ignoreWindowResize = 0;
- var date = new Date();
+ var date = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]);
var events = [];
var _dragElement;
@@ -2275,7 +2275,7 @@ @@ -2275,7 +2275,7 @@
function updateCells(firstTime) { function updateCells(firstTime) {
var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating? var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
@ -15,7 +32,22 @@ $diff -u fullcalendar_original.js fullcalendar.js
var cell; var cell;
var date; var date;
var row; var row;
@@ -3108,7 +3108,7 @@
var headCell;
var bodyCell;
var date;
- var today = clearTime(new Date());
+ var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset")));
for (i=0; i<colCnt; i++) {
date = colDate(i);
headCell = dayHeadCells.eq(i);
@@ -5205,4 +5205,4 @@
}
-})(jQuery);
\ No newline at end of file
+})(jQuery);
adjustDateToServerDate() function is defined in "js/airtime/schedule/full-calendar-functions.js" adjustDateToServerDate() function is defined in "js/airtime/schedule/full-calendar-functions.js"

View file

@ -1,6 +1,6 @@
/** /**
* @preserve * @preserve
* FullCalendar v1.5.1 * FullCalendar v1.5.1-CUSTOM (Changes by Martin Konecny -added primitive support for timezones)
* http://arshaw.com/fullcalendar/ * http://arshaw.com/fullcalendar/
* *
* Use fullcalendar.css for basic styling. * Use fullcalendar.css for basic styling.
@ -227,7 +227,7 @@ function Calendar(element, options, eventSources) {
var absoluteViewElement; var absoluteViewElement;
var resizeUID = 0; var resizeUID = 0;
var ignoreWindowResize = 0; var ignoreWindowResize = 0;
var date = new Date(); var date = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]);
var events = []; var events = [];
var _dragElement; var _dragElement;
@ -3108,7 +3108,7 @@ function AgendaView(element, calendar, viewName) {
var headCell; var headCell;
var bodyCell; var bodyCell;
var date; var date;
var today = clearTime(new Date()); var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset")));
for (i=0; i<colCnt; i++) { for (i=0; i<colCnt; i++) {
date = colDate(i); date = colDate(i);
headCell = dayHeadCells.eq(i); headCell = dayHeadCells.eq(i);

File diff suppressed because it is too large Load diff