summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-06-27 19:50:18 (GMT)
committerThomas Bruederli <thomas@roundcube.net>2012-06-27 20:10:20 (GMT)
commit41ad79297e9b3e861b4a42336799ea9bfa1273f3 (patch)
tree26ae01151e769eb6948660dacd68eda5076a499a
parentccac5e660adf0dff092f6253446e273b03328073 (diff)
downloadroundcubemail-plugins-kolab-41ad79297e9b3e861b4a42336799ea9bfa1273f3.tar.gz
Backported: Fix overflow link computation in month view + pull in upstream changes
-rw-r--r--plugins/calendar/lib/js/fullcalendar.js26
1 files changed, 14 insertions, 12 deletions
diff --git a/plugins/calendar/lib/js/fullcalendar.js b/plugins/calendar/lib/js/fullcalendar.js
index b04c86e..75babb8 100644
--- a/plugins/calendar/lib/js/fullcalendar.js
+++ b/plugins/calendar/lib/js/fullcalendar.js
@@ -1,7 +1,7 @@
/**
* @preserve
- * FullCalendar v1.5.2
- * http://arshaw.com/fullcalendar/
+ * FullCalendar v1.5.3-rcube-0.7.2
+ * https://github.com/roundcube/fullcalendar
*
* Use fullcalendar.css for basic styling.
* For event drag & drop, requires jQuery UI draggable.
@@ -11,7 +11,7 @@
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
- * Date: Sun Aug 21 22:06:09 2011 -0700
+ * Date: Sun Mar 4 14:35:09 2012 +0100
*
*/
@@ -136,7 +136,7 @@ var rtlDefaults = {
-var fc = $.fullCalendar = { version: "1.5.2" };
+var fc = $.fullCalendar = { version: "1.5.3-rcube-0.7.2" };
var fcViews = fc.views = {};
@@ -4652,11 +4652,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;
@@ -5656,7 +5656,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) {
@@ -5762,7 +5763,7 @@ function TableEventRenderer() {
s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
}
} 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>";
@@ -5888,7 +5889,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) {
@@ -5902,4 +5904,4 @@ function TableView(element, calendar) {
}
-})(jQuery); \ No newline at end of file
+})(jQuery);