Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-5222: Calendar: Ends time of show is missed in Weekly view

This commit is contained in:
drigato 2013-07-19 12:46:04 -04:00
parent de76b3a12f
commit f76bb5209e
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
airtime_mvc/public/js/fullcalendar/AIRTIME_DEV_README
View File

@ -3,14 +3,14 @@ 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:
martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js denise@denise-desktop:~/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js
--- fullcalendar_orig.js 2011-04-09 17:13:15.000000000 -0400 --- fullcalendar_orig.js 2013-05-24 08:33:54.462735215 -0400
+++ fullcalendar.js 2011-11-18 17:03:57.000000000 -0500 +++ fullcalendar.js 2013-07-19 12:42:37.274284180 -0400
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/** /**
* @preserve * @preserve
- * FullCalendar v1.5.1 - * FullCalendar v1.5.3
+ * FullCalendar v1.5.1-CUSTOM (Changes by Martin Konecny -added primitive support for timezones) + * FullCalendar v1.5.3-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.
@ -23,7 +23,7 @@ martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ dif
var events = []; var events = [];
var _dragElement; var _dragElement;
@@ -2275,7 +2275,7 @@ @@ -2277,7 +2277,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?
var month = t.start.getMonth(); var month = t.start.getMonth();
@ -32,7 +32,7 @@ martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ dif
var cell; var cell;
var date; var date;
var row; var row;
@@ -3108,7 +3108,7 @@ @@ -3110,7 +3110,7 @@
var headCell; var headCell;
var bodyCell; var bodyCell;
var date; var date;
@ -41,9 +41,16 @@ martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ dif
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);
@@ -5205,4 +5205,4 @@ @@ -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();
}
}
-})(jQuery); -})(jQuery);
\ No newline at end of file \ No newline at end of file

2
airtime_mvc/public/js/fullcalendar/fullcalendar.js
View File

@ -3867,7 +3867,7 @@ function AgendaEventRenderer() {
if (seg.contentTop !== undefined && height - seg.contentTop < 10) { if (seg.contentTop !== undefined && height - seg.contentTop < 10) {
// not enough room for title, put it in the time header // not enough room for title, put it in the time header
eventElement.find('div.fc-event-time') 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') eventElement.find('div.fc-event-title')
.remove(); .remove();
} }