Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix overflow link computation in month view + pull in upstream changes

Browse source
This commit is contained in:
Thomas Bruederli 2012-06-27 21:50:18 +02:00
parent b4172e7aed
commit 1c9e7d2698
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/calendar/lib/js/fullcalendar.js
View file

@ -1,6 +1,6 @@
/** /**
* @preserve * @preserve
* FullCalendar v1.5.3-rcube-0.7.1 * FullCalendar v1.5.3-rcube-0.7.2
* https://github.com/roundcube/fullcalendar * https://github.com/roundcube/fullcalendar
* *
* Use fullcalendar.css for basic styling. * Use fullcalendar.css for basic styling.
@ -12,7 +12,7 @@
* Dual licensed under the MIT and GPL licenses, located in * Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively. * 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 = {}; var fcViews = fc.views = {};
@ -4655,11 +4655,11 @@ function DayEventRenderer() {
if (overflows[k]) if (overflows[k])
seg.overflow = true; seg.overflow = true;
if (seg.overflow) { 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]++; 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 else
colHeights[k] = top; colHeights[k] = top;
@ -5672,7 +5672,8 @@ function ListView(element, calendar) {
} }
function setHeight(height, dateChanged) { 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) { function setWidth(width) {
@ -5777,7 +5778,7 @@ function TableEventRenderer() {
s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>"; s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
} }
} else { } else {
s += "<td class='fc-event-" + col + "'>" + (htmlEscape(event[col]) || '&nbsp;') + "</td>"; s += "<td class='fc-event-" + col + "'>" + (event[col] ? htmlEscape(event[col]) : '&nbsp;') + "</td>";
} }
} }
s += "</tr>"; s += "</tr>";
@ -5903,7 +5904,8 @@ function TableView(element, calendar) {
} }
function setHeight(height, dateChanged) { 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) { function setWidth(width) {