0f2848be22
Update fullcalendar from 1.5.3 to 1.5.4 Apply custom timezone changes to fullcalendar 1.5.4
51 lines
1.8 KiB
Text
51 lines
1.8 KiB
Text
Before you overwrite fullcalendar.js, note that we have changed a few lines
|
|
in this file.
|
|
|
|
Running a diff between the original fullcalendar.js and our modified one:
|
|
|
|
denise@denise-DX4860:~/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js
|
|
--- fullcalendar_orig.js 2013-10-08 16:03:35.442375219 -0400
|
|
+++ fullcalendar.js 2013-10-08 16:53:02.586338519 -0400
|
|
@@ -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;
|
|
|
|
@@ -2273,7 +2273,7 @@
|
|
function updateCells(firstTime) {
|
|
var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
|
|
var month = t.start.getMonth();
|
|
- var today = clearTime(new Date());
|
|
+ var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset")));
|
|
var cell;
|
|
var date;
|
|
var row;
|
|
@@ -3106,7 +3106,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);
|
|
@@ -3863,7 +3863,7 @@
|
|
if (seg.contentTop !== undefined && height - seg.contentTop < 10) {
|
|
// not enough room for title, put it in the time header
|
|
eventElement.find('div.fc-event-time')
|
|
- .text(formatDate(event.start, opt('timeFormat')) + ' - ' + event.title);
|
|
+ .text(formatDate(event.start, opt('timeFormat')) + ' - ' + formatDate(event.end, opt('timeFormat')) + ' ' + event.title);
|
|
eventElement.find('div.fc-event-title')
|
|
.remove();
|
|
}
|
|
|
|
|
|
|
|
adjustDateToServerDate() function is defined in "js/airtime/common/common.js"
|
|
|
|
Please make this change before updating!!!
|
|
|