diff --git a/airtime_mvc/public/js/fullcalendar/AIRTIME_DEV_README_June_7_2012 b/airtime_mvc/public/js/fullcalendar/AIRTIME_DEV_README_June_7_2012 new file mode 100644 index 000000000..1caa62b9e --- /dev/null +++ b/airtime_mvc/public/js/fullcalendar/AIRTIME_DEV_README_June_7_2012 @@ -0,0 +1,169 @@ +Before you overwrite fullcalendar.js, note that we have changed a few lines +in this file. + +Running a diff between the original (fullcalendarMKchanged.js) and our modified one (fullcalendar.js): + +denise@denise-DX4860:~/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendarMKchanged.js fullcalendar.js +--- fullcalendarMKchanged.js 2012-04-11 17:39:06.734126350 -0400 ++++ fullcalendar.js 2012-06-07 16:08:56.426248827 -0400 +@@ -1,6 +1,6 @@ + /** + * @preserve +- * FullCalendar v1.5.1-CUSTOM (Changes by Martin Konecny -added primitive support for timezones) ++ * FullCalendar v1.5.3 + * http://arshaw.com/fullcalendar/ + * + * Use fullcalendar.css for basic styling. +@@ -11,7 +11,7 @@ + * Dual licensed under the MIT and GPL licenses, located in + * MIT-LICENSE.txt and GPL-LICENSE.txt respectively. + * +- * Date: Sat Apr 9 14:09:51 2011 -0700 ++ * Date: Mon Feb 6 22:40:40 2012 -0800 + * + */ + +@@ -111,7 +111,7 @@ + + + +-var fc = $.fullCalendar = { version: "1.5.1" }; ++var fc = $.fullCalendar = { version: "1.5.3" }; + var fcViews = fc.views = {}; + + +@@ -227,7 +227,7 @@ + var absoluteViewElement; + var resizeUID = 0; + var ignoreWindowResize = 0; +- var date = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]); ++ var date = new Date(); + var events = []; + var _dragElement; + +@@ -399,9 +399,7 @@ + elementOuterWidth = element.outerWidth(); + + header.updateTitle(currentView.title); +- //adjusting this date ensures that the "today" button is greyed out on the +- //correct day. +- var today = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]); ++ var today = new Date(); + if (today >= currentView.start && today < currentView.end) { + header.disableButton('today'); + }else{ +@@ -583,8 +581,7 @@ + + + function today() { +- //adjusting this date ensures that clicking "today" takes us to the correct date. +- date = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]); ++ date = new Date(); + renderView(); + } + +@@ -1398,7 +1395,7 @@ + return null; + } + var date = new Date(m[1], 0, 1); +- if (ignoreTimezone || !m[14]) { ++ if (ignoreTimezone || !m[13]) { + var check = new Date(m[1], 0, 1, 9, 0); + if (m[3]) { + date.setMonth(m[3] - 1); +@@ -1434,9 +1431,11 @@ + m[10] || 0, + m[12] ? Number("0." + m[12]) * 1000 : 0 + ); +- var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0); +- offset *= m[15] == '-' ? 1 : -1; +- date = new Date(+date + (offset * 60 * 1000)); ++ if (m[14]) { ++ var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0); ++ offset *= m[15] == '-' ? 1 : -1; ++ date = new Date(+date + (offset * 60 * 1000)); ++ } + } + return date; + } +@@ -2188,11 +2187,18 @@ + }else{ + clearEvents(); + } +- updateCells(firstTime); ++ getOffset(); + } + +- +- ++ function getOffset() { ++ var timezoneOffset; ++ $.ajax({ url: "/Api/calendar-init/format/json", dataType:"json", success:function(data) { ++ timezoneOffset = data.calendarInit.timezoneOffset*1000; ++ var firstTime = !body; ++ updateCells(firstTime, timezoneOffset); ++ }, error:function(jqXHR, textStatus, errorThrown){}}); ++ } ++ + function updateOptions() { + rtl = opt('isRTL'); + if (rtl) { +@@ -2273,15 +2279,17 @@ + .appendTo(element); + } + +- +- +- function updateCells(firstTime) { ++ function updateCells(firstTime, timezoneOffset) { + var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating? + var month = t.start.getMonth(); +- var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset"))); + var cell; + var date; + var row; ++ ++ var today = new Date(); ++ var utc = today.getTime() + (today.getTimezoneOffset()*60000); ++ var userTime = new Date(utc + timezoneOffset); ++ today = clearTime(userTime); + + if (dowDirty) { + headCells.each(function(i, _cell) { +@@ -3111,7 +3119,7 @@ + var headCell; + var bodyCell; + var date; +- var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset"))); ++ var today = clearTime(new Date()); + for (i=0; i