2 commits - plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Wed Nov 7 18:37:14 CET 2012
plugins/calendar/lib/js/fullcalendar.js | 50 +++++++++++-------------
plugins/calendar/skins/classic/fullcalendar.css | 4 -
2 files changed, 25 insertions(+), 29 deletions(-)
New commits:
commit f88e21684531f04879d2913865bd50af0f678038
Merge: ba76545 f7b2e54
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Nov 7 18:36:57 2012 +0100
Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube
commit ba765457b3ac494ce108ab0db340497e42702c9a
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Nov 7 18:36:35 2012 +0100
Updated to fullcalendar 1.5.4-rcube-0.9.0 (merged upstream version 1.5.4)
diff --git a/plugins/calendar/lib/js/fullcalendar.js b/plugins/calendar/lib/js/fullcalendar.js
index 09b655f..f790eea 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.2
+ * FullCalendar v1.5.4-rcube-0.9.0
* 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: Sun Mar 4 14:35:09 2012 +0100
+ * Date: Wed Nov 7 16:28:11 2012 +0100
*
*/
@@ -137,7 +137,7 @@ var rtlDefaults = {
-var fc = $.fullCalendar = { version: "1.5.3-rcube-0.7.2" };
+var fc = $.fullCalendar = { version: "1.5.4-rcube-0.9.0" };
var fcViews = fc.views = {};
@@ -1708,7 +1708,7 @@ function sliceSegs(events, visEventEnds, start, end) {
msLength: segEnd - segStart
});
}
- }
+ }
return segs.sort(segCmp);
}
@@ -1792,29 +1792,26 @@ function setOuterHeight(element, height, includeMargins) {
}
-// TODO: curCSS has been deprecated (jQuery 1.4.3 - 10/16/2010)
-
-
function hsides(element, includeMargins) {
return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
}
function hpadding(element) {
- return (parseFloat($.curCSS(element[0], 'paddingLeft', true)) || 0) +
- (parseFloat($.curCSS(element[0], 'paddingRight', true)) || 0);
+ return (parseFloat($.css(element[0], 'paddingLeft', true)) || 0) +
+ (parseFloat($.css(element[0], 'paddingRight', true)) || 0);
}
function hmargins(element) {
- return (parseFloat($.curCSS(element[0], 'marginLeft', true)) || 0) +
- (parseFloat($.curCSS(element[0], 'marginRight', true)) || 0);
+ return (parseFloat($.css(element[0], 'marginLeft', true)) || 0) +
+ (parseFloat($.css(element[0], 'marginRight', true)) || 0);
}
function hborders(element) {
- return (parseFloat($.curCSS(element[0], 'borderLeftWidth', true)) || 0) +
- (parseFloat($.curCSS(element[0], 'borderRightWidth', true)) || 0);
+ return (parseFloat($.css(element[0], 'borderLeftWidth', true)) || 0) +
+ (parseFloat($.css(element[0], 'borderRightWidth', true)) || 0);
}
@@ -1824,20 +1821,20 @@ function vsides(element, includeMargins) {
function vpadding(element) {
- return (parseFloat($.curCSS(element[0], 'paddingTop', true)) || 0) +
- (parseFloat($.curCSS(element[0], 'paddingBottom', true)) || 0);
+ return (parseFloat($.css(element[0], 'paddingTop', true)) || 0) +
+ (parseFloat($.css(element[0], 'paddingBottom', true)) || 0);
}
function vmargins(element) {
- return (parseFloat($.curCSS(element[0], 'marginTop', true)) || 0) +
- (parseFloat($.curCSS(element[0], 'marginBottom', true)) || 0);
+ return (parseFloat($.css(element[0], 'marginTop', true)) || 0) +
+ (parseFloat($.css(element[0], 'marginBottom', true)) || 0);
}
function vborders(element) {
- return (parseFloat($.curCSS(element[0], 'borderTopWidth', true)) || 0) +
- (parseFloat($.curCSS(element[0], 'borderBottomWidth', true)) || 0);
+ return (parseFloat($.css(element[0], 'borderTopWidth', true)) || 0) +
+ (parseFloat($.css(element[0], 'borderBottomWidth', true)) || 0);
}
@@ -2006,7 +2003,6 @@ function firstDefined() {
}
-
fcViews.month = MonthView;
function MonthView(element, calendar) {
@@ -4655,11 +4651,11 @@ function DayEventRenderer() {
if (overflows[k])
seg.overflow = true;
if (seg.overflow) {
- 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])
+ 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]++;
}
else
colHeights[k] = top;
@@ -5420,7 +5416,7 @@ function ListEventRenderer() {
event = events[i];
// skip events out of range
- if (event.end < t.start || event.start > t.visEnd)
+ if ((event.end || event.start) < t.start || event.start > t.visEnd)
continue;
// define sections of this event
@@ -5473,7 +5469,7 @@ function ListEventRenderer() {
function sortCmp(a, b) {
var sd = a.start.getTime() - b.start.getTime();
- return sd + (sd ? 0 : a.end.getTime() - b.end.getTime());
+ return sd || (a.end ? a.end.getTime() : 0) - (b.end ? b.end.getTime() : 0);
}
function renderSegs(segs, modifiedEventId) {
@@ -5555,7 +5551,7 @@ function ListEventRenderer() {
var timeFormat = opt('timeFormat');
var dateFormat = opt('columnFormat');
var segmode = opt('listSections');
- var duration = event.end.getTime() - event.start.getTime();
+ var duration = event.end ? event.end.getTime() - event.start.getTime() : 0;
var datestr = '', timestr = '';
if (segmode == 'smart') {
diff --git a/plugins/calendar/skins/classic/fullcalendar.css b/plugins/calendar/skins/classic/fullcalendar.css
index 17f1b37..bf9e7dd 100644
--- a/plugins/calendar/skins/classic/fullcalendar.css
+++ b/plugins/calendar/skins/classic/fullcalendar.css
@@ -1,12 +1,12 @@
/*
- * FullCalendar v1.5.3-rcube-0.7.1 Stylesheet
+ * FullCalendar v1.5.4-rcube-0.9.0 Stylesheet
*
* Copyright (c) 2011 Adam Shaw
* Copyright (c) 2011, Kolab Systems AG
* 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: Wed Nov 7 16:28:11 2012 +0100
*
*/
More information about the commits
mailing list