2011-11-18 23:07:12 +01:00
|
|
|
Before you overwrite fullcalendar.js, note that we have changed a few lines
|
|
|
|
in this file.
|
2011-08-19 18:07:34 +02:00
|
|
|
|
|
|
|
Running a diff between the original fullcalendar.js and our modified one:
|
|
|
|
|
2013-07-19 18:46:04 +02:00
|
|
|
denise@denise-desktop:~/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js
|
|
|
|
--- fullcalendar_orig.js 2013-05-24 08:33:54.462735215 -0400
|
|
|
|
+++ fullcalendar.js 2013-07-19 12:42:37.274284180 -0400
|
2011-11-18 23:07:12 +01:00
|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
/**
|
|
|
|
* @preserve
|
2013-07-19 18:46:04 +02:00
|
|
|
- * FullCalendar v1.5.3
|
|
|
|
+ * FullCalendar v1.5.3-CUSTOM (Changes by Martin Konecny -added primitive support for timezones)
|
2011-11-18 23:07:12 +01:00
|
|
|
* 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;
|
|
|
|
|
2013-07-19 18:46:04 +02:00
|
|
|
@@ -2277,7 +2277,7 @@
|
2011-08-19 18:07:34 +02:00
|
|
|
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;
|
2013-07-19 18:46:04 +02:00
|
|
|
@@ -3110,7 +3110,7 @@
|
2011-11-18 23:07:12 +01:00
|
|
|
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);
|
2013-07-19 18:46:04 +02:00
|
|
|
@@ -3867,7 +3867,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();
|
|
|
|
}
|
|
|
|
|
2011-11-18 23:07:12 +01:00
|
|
|
|
|
|
|
-})(jQuery);
|
|
|
|
\ No newline at end of file
|
|
|
|
+})(jQuery);
|
2011-08-19 18:07:34 +02:00
|
|
|
|
|
|
|
|
2011-11-25 23:36:11 +01:00
|
|
|
adjustDateToServerDate() function is defined in "js/airtime/common/common.js"
|
2011-08-19 18:07:34 +02:00
|
|
|
|
|
|
|
Please make this change before updating!!!
|
|
|
|
|