diff --git a/plugins/calendar/lib/js/fullcalendar.js b/plugins/calendar/lib/js/fullcalendar.js index bffc0e7a..09b655f8 100644 --- a/plugins/calendar/lib/js/fullcalendar.js +++ b/plugins/calendar/lib/js/fullcalendar.js @@ -1,6 +1,6 @@ /** * @preserve - * FullCalendar v1.5.3-rcube-0.7.1 + * FullCalendar v1.5.3-rcube-0.7.2 * https://github.com/roundcube/fullcalendar * * Use fullcalendar.css for basic styling. @@ -12,7 +12,7 @@ * Dual licensed under the MIT and GPL licenses, located in * MIT-LICENSE.txt and GPL-LICENSE.txt respectively. * - * Date: Mon Feb 13 23:00:46 2012 +0100 + * Date: Sun Mar 4 14:35:09 2012 +0100 * */ @@ -137,7 +137,7 @@ var rtlDefaults = { -var fc = $.fullCalendar = { version: "1.5.3-rcube-0.7.1" }; +var fc = $.fullCalendar = { version: "1.5.3-rcube-0.7.2" }; var fcViews = fc.views = {}; @@ -4655,11 +4655,11 @@ function DayEventRenderer() { if (overflows[k]) seg.overflow = true; if (seg.overflow) { - if (seg.isStart && !overflowLinks[k]) - overflowLinks[k] = { seg:seg, top:top, date:cloneDate(seg.start, true), count:0 }; - if (overflowLinks[k]) - overflowLinks[k].count++; overflows[k]++; + if (seg.isStart && k == seg.startCol && !overflowLinks[k]) + overflowLinks[k] = { seg:seg, top:top, date:cloneDate(seg.start, true), count:(overflows[k]||0) }; + else if (overflowLinks[k]) + overflowLinks[k].count++; } else colHeights[k] = top; @@ -5672,7 +5672,8 @@ function ListView(element, calendar) { } function setHeight(height, dateChanged) { - body.css('height', (height-1)+'px').css('overflow', 'auto'); + if (!opt('listNoHeight')) + body.css('height', (height-1)+'px').css('overflow', 'auto'); } function setWidth(width) { @@ -5777,7 +5778,7 @@ function TableEventRenderer() { s += "" + htmlEscape(times[1]) + ""; } } else { - s += "" + (htmlEscape(event[col]) || ' ') + ""; + s += "" + (event[col] ? htmlEscape(event[col]) : ' ') + ""; } } s += ""; @@ -5903,7 +5904,8 @@ function TableView(element, calendar) { } function setHeight(height, dateChanged) { - div.css('height', (height-1)+'px').css('overflow', 'auto'); + if (!opt('listNoHeight')) + div.css('height', (height-1)+'px').css('overflow', 'auto'); } function setWidth(width) {