2 commits - plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Tue May 27 10:10:49 CEST 2014
plugins/calendar/lib/calendar_ui.php | 4
plugins/calendar/lib/fullcalendar-rc.patch | 943 ----
plugins/calendar/lib/js/fullcalendar.js | 5108 ++++++++++++++----------
plugins/calendar/print.js | 6
plugins/calendar/skins/classic/calendar.css | 14
plugins/calendar/skins/classic/fullcalendar.css | 725 ---
plugins/calendar/skins/classic/print.css | 2
plugins/calendar/skins/larry/calendar.css | 83
plugins/calendar/skins/larry/fullcalendar.css | 708 +++
plugins/calendar/skins/larry/print.css | 2
10 files changed, 3747 insertions(+), 3848 deletions(-)
New commits:
commit f2e66acc6ae8260db157b11e75cb1277a6bc70cc
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Tue May 27 10:10:28 2014 +0200
Update fullcalendar script and styles to version 1.6.4
diff --git a/plugins/calendar/lib/fullcalendar-rc.patch b/plugins/calendar/lib/fullcalendar-rc.patch
deleted file mode 100644
index fd0ea6f..0000000
--- a/plugins/calendar/lib/fullcalendar-rc.patch
+++ /dev/null
@@ -1,943 +0,0 @@
---- js/fullcalendar-1.5.2.js 2011-08-21 22:07:18.000000000 +0200
-+++ js/fullcalendar.js 2011-11-14 23:44:05.000000000 +0100
-@@ -29,6 +29,7 @@
- right: 'today prev,next'
- },
- weekends: true,
-+ currentTimeIndicator: false,
-
- // editing
- //editable: false,
-@@ -47,12 +48,16 @@
- titleFormat: {
- month: 'MMMM yyyy',
- week: "MMM d[ yyyy]{ '—'[ MMM] d yyyy}",
-- day: 'dddd, MMM d, yyyy'
-+ day: 'dddd, MMM d, yyyy',
-+ list: 'MMM d, yyyy',
-+ table: 'MMM d, yyyy'
- },
- columnFormat: {
- month: 'ddd',
- week: 'ddd M/d',
-- day: 'dddd M/d'
-+ day: 'dddd M/d',
-+ list: 'dddd, MMM d, yyyy',
-+ table: 'dddd, MMM d, yyyy'
- },
- timeFormat: { // for event elements
- '': 'h(:mm)t' // default
-@@ -73,8 +78,28 @@
- today: 'today',
- month: 'month',
- week: 'week',
-- day: 'day'
-+ day: 'day',
-+ list: 'list',
-+ table: 'table'
- },
-+ listTexts: {
-+ until: 'until',
-+ past: 'Past events',
-+ today: 'Today',
-+ tomorrow: 'Tomorrow',
-+ thisWeek: 'This week',
-+ nextWeek: 'Next week',
-+ thisMonth: 'This month',
-+ nextMonth: 'Next month',
-+ future: 'Future events',
-+ week: 'W'
-+ },
-+
-+ // list/table options
-+ listSections: 'month', // false|'day'|'week'|'month'|'smart'
-+ listRange: 30, // number of days to be displayed
-+ listPage: 7, // number of days to jump when paging
-+ tableCols: ['handle', 'date', 'time', 'title'],
-
- // jquery-ui theming
- theme: false,
-@@ -424,6 +449,7 @@
- setSize();
- unselect();
- currentView.clearEvents();
-+ currentView.trigger('viewRender', currentView);
- currentView.renderEvents(events);
- currentView.sizeDirty = false;
- }
-@@ -500,8 +526,8 @@
- }
-
-
-- function refetchEvents() {
-- fetchEvents(currentView.visStart, currentView.visEnd); // will call reportEvents
-+ function refetchEvents(source) {
-+ fetchEvents(currentView.visStart, currentView.visEnd, source); // will call reportEvents
- }
-
-
-@@ -523,6 +549,7 @@
- markEventsDirty();
- if (elementVisible()) {
- currentView.clearEvents();
-+ currentView.trigger('viewRender', currentView);
- currentView.renderEvents(events, modifiedEventID);
- currentView.eventsDirty = false;
- }
-@@ -632,6 +659,12 @@
- if (name == 'height' || name == 'contentHeight' || name == 'aspectRatio') {
- options[name] = value;
- updateSize();
-+ } else if (name.indexOf('list') == 0 || name == 'tableCols') {
-+ options[name] = value;
-+ currentView.start = null; // force re-render
-+ }
-+ else if (name == 'maxHeight') {
-+ options[name] = value;
- }
- }
-
-@@ -897,15 +930,16 @@
- }
-
-
-- function fetchEvents(start, end) {
-+ function fetchEvents(start, end, src) {
- rangeStart = start;
- rangeEnd = end;
-- cache = [];
-+ cache = typeof src != 'undefined' ? $.grep(cache, function(e) { return !isSourcesEqual(e.source, src); }) : [];
- var fetchID = ++currentFetchID;
- var len = sources.length;
-- pendingSourceCnt = len;
-+ pendingSourceCnt = typeof src == 'undefined' ? len : 1;
- for (var i=0; i<len; i++) {
-- fetchEventSource(sources[i], fetchID);
-+ if (typeof src == 'undefined' || isSourcesEqual(sources[i], src))
-+ fetchEventSource(sources[i], fetchID);
- }
- }
-
-@@ -1092,8 +1126,9 @@
- stickySource.events.push(event);
- event.source = stickySource;
- }
-- cache.push(event);
- }
-+
-+ cache.push(event);
- reportEvents(cache);
- }
-
-@@ -1581,10 +1616,23 @@
- return 'th';
- }
- return ['st', 'nd', 'rd'][date%10-1] || 'th';
-- }
-+ },
-+ W : function(d) { return iso8601Week(d); }
- };
-
-
-+// Determine the week of the year based on the ISO 8601 definition.
-+// copied from jquery UI Datepicker
-+var iso8601Week = function(date) {
-+ var checkDate = cloneDate(date);
-+ // Find Thursday of this week starting on Monday
-+ checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
-+ var time = checkDate.getTime();
-+ checkDate.setMonth(0); // Compare with Jan 1
-+ checkDate.setDate(1);
-+ return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
-+};
-+
-
- fc.applyAll = applyAll;
-
-@@ -3536,10 +3584,10 @@
- function slotSelectionMousedown(ev) {
- if (ev.which == 1 && opt('selectable')) { // ev.which==1 means left mouse button
- unselect(ev);
-- var dates;
-+ var dates, helperOption = opt('selectHelper');
- hoverListener.start(function(cell, origCell) {
- clearSelection();
-- if (cell && cell.col == origCell.col && !cellIsAllDay(cell)) {
-+ if (cell && (cell.col == origCell.col || !helperOption) && !cellIsAllDay(cell)) {
- var d1 = cellDate(origCell);
- var d2 = cellDate(cell);
- dates = [
-@@ -3651,7 +3699,7 @@
- var calendar = t.calendar;
- var formatDate = calendar.formatDate;
- var formatDates = calendar.formatDates;
--
-+ var timeLineInterval;
-
-
- /* Rendering
-@@ -3675,6 +3723,12 @@
- setHeight(); // no params means set to viewHeight
- }
- renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
-+
-+ if (opt('currentTimeIndicator')) {
-+ window.clearInterval(timeLineInterval);
-+ timeLineInterval = window.setInterval(setTimeIndicator, 30000);
-+ setTimeIndicator();
-+ }
- }
-
-
-@@ -3764,7 +3818,8 @@
- height,
- slotSegmentContainer = getSlotSegmentContainer(),
- rtl, dis, dit,
-- colCnt = getColCnt();
-+ colCnt = getColCnt(),
-+ overlapping = colCnt > 1;
-
- if (rtl = opt('isRTL')) {
- dis = -1;
-@@ -3791,8 +3846,11 @@
- outerWidth = availWidth / (levelI + forward + 1);
- }else{
- if (forward) {
-- // moderately wide, aligned left still
-- outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
-+ if (overlapping) { // moderately wide, aligned left still
-+ outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
-+ }else{
-+ outerWidth = outerWidth = availWidth / (forward + 1);
-+ }
- }else{
- // can be entire width, aligned left
- outerWidth = availWidth;
-@@ -3803,7 +3861,7 @@
- * dis + (rtl ? availWidth - outerWidth : 0); // rtl
- seg.top = top;
- seg.left = left;
-- seg.outerWidth = outerWidth;
-+ seg.outerWidth = outerWidth - (overlapping ? 0 : 1);
- seg.outerHeight = bottom - top;
- html += slotSegHtml(event, seg);
- }
-@@ -3953,6 +4011,37 @@
- }
-
-
-+ // draw a horizontal line across the agenda view indicating the current time (#143)
-+ function setTimeIndicator()
-+ {
-+ var container = getBodyContent();
-+ var timeline = container.children('.fc-timeline');
-+ if (timeline.length == 0) { // if timeline isn't there, add it
-+ timeline = $('<hr>').addClass('fc-timeline').appendTo(container);
-+ }
-+
-+ var cur_time = new Date();
-+ if (t.visStart < cur_time && t.visEnd > cur_time) {
-+ timeline.show();
-+ }
-+ else {
-+ timeline.hide();
-+ return;
-+ }
-+
-+ var secs = (cur_time.getHours() * 60 * 60) + (cur_time.getMinutes() * 60) + cur_time.getSeconds();
-+ var percents = secs / 86400; // 24 * 60 * 60 = 86400, # of seconds in a day
-+
-+ timeline.css('top', Math.floor(container.height() * percents - 1) + 'px');
-+
-+ if (t.name == 'agendaWeek') { // week view, don't want the timeline to go the whole way across
-+ var daycol = $('.fc-today', t.element);
-+ var left = daycol.position().left + 1;
-+ var width = daycol.width();
-+ timeline.css({ left: left + 'px', width: width + 'px' });
-+ }
-+ }
-+
-
- /* Dragging
- -----------------------------------------------------------------------------------*/
-@@ -4262,7 +4351,7 @@
-
- function opt(name, viewNameOverride) {
- var v = options[name];
-- if (typeof v == 'object') {
-+ if (typeof v == 'object' && !v.length) {
- return smartProperty(v, viewNameOverride || viewName);
- }
- return v;
-@@ -4528,6 +4617,9 @@
- var seg;
- var top;
- var k;
-+ var overflows;
-+ var overflowLinks;
-+ var maxHeight = opt('maxHeight');
- segmentContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
- daySegElementResolve(segs, segmentContainer.children());
- daySegElementReport(segs);
-@@ -4539,26 +4631,69 @@
- // set row heights, calculate event tops (in relation to row top)
- for (rowI=0; rowI<rowCnt; rowI++) {
- levelI = 0;
-+ overflows = [];
-+ overflowLinks = {};
- colHeights = [];
- for (j=0; j<colCnt; j++) {
-+ overflows[j] = 0;
- colHeights[j] = 0;
- }
- while (i<segCnt && (seg = segs[i]).row == rowI) {
- // loop through segs in a row
- top = arrayMax(colHeights.slice(seg.startCol, seg.endCol));
-- seg.top = top;
-- top += seg.outerHeight;
-+ if (maxHeight && top + seg.outerHeight > maxHeight) {
-+ seg.overflow = true;
-+ }
-+ else {
-+ seg.top = top;
-+ top += seg.outerHeight;
-+ }
- for (k=seg.startCol; k<seg.endCol; k++) {
-- colHeights[k] = top;
-+ 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]++;
-+ }
-+ else
-+ colHeights[k] = top;
- }
- i++;
- }
- rowDivs[rowI].height(arrayMax(colHeights));
-+ renderOverflowLinks(overflowLinks, rowDivs[rowI]);
- }
- daySegSetTops(segs, getRowTops(rowDivs));
- }
-
-
-+ function renderOverflowLinks(overflowLinks, rowDiv) {
-+ var container = getDaySegmentContainer();
-+ var colCnt = getColCnt();
-+ var element, triggerRes, link;
-+ for (var j=0; j<colCnt; j++) {
-+ if ((link = overflowLinks[j])) {
-+ if (link.count > 1) {
-+ element = $('<a>').addClass('fc-more-link').html('+'+link.count).appendTo(container);
-+ element[0].style.position = 'absolute';
-+ element[0].style.left = link.seg.left + 'px';
-+ element[0].style.top = (link.top + rowDiv[0].offsetTop) + 'px';
-+ triggerRes = trigger('overflowRender', link, { count:link.count, date:link.date }, element);
-+ if (triggerRes === false)
-+ element.remove();
-+ }
-+ else {
-+ link.seg.top = link.top;
-+ link.seg.overflow = false;
-+ }
-+ }
-+ }
-+ }
-+
-+
- function renderTempDaySegs(segs, adjustRow, adjustTop) {
- var tempContainer = $("<div/>");
- var elements;
-@@ -4806,6 +4941,8 @@
- }
- seg.outerHeight = element[0].offsetHeight + val;
- }
-+ else
-+ seg.outerHeight = 0;
- }
- }
-
-@@ -4842,11 +4979,13 @@
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- element = seg.element;
-- if (element) {
-+ if (element && !seg.overflow) {
- element[0].style.top = rowTops[seg.row] + (seg.top||0) + 'px';
- event = seg.event;
- trigger('eventAfterRender', event, event, element);
- }
-+ else if (element)
-+ element.hide();
- }
- }
-
-@@ -5206,5 +5345,561 @@
- };
-
- }
--
--})(jQuery);
-+
-+
-+/* Additional view: list (by bruederli at kolabsys.com)
-+---------------------------------------------------------------------------------*/
-+
-+function ListEventRenderer() {
-+ var t = this;
-+
-+ // exports
-+ t.renderEvents = renderEvents;
-+ t.renderEventTime = renderEventTime;
-+ t.compileDaySegs = compileSegs; // for DayEventRenderer
-+ t.clearEvents = clearEvents;
-+ t.lazySegBind = lazySegBind;
-+ t.sortCmp = sortCmp;
-+
-+ // imports
-+ DayEventRenderer.call(t);
-+ var opt = t.opt;
-+ var trigger = t.trigger;
-+ var reportEvents = t.reportEvents;
-+ var reportEventClear = t.reportEventClear;
-+ var reportEventElement = t.reportEventElement;
-+ var eventElementHandlers = t.eventElementHandlers;
-+ var showEvents = t.showEvents;
-+ var hideEvents = t.hideEvents;
-+ var getListContainer = t.getDaySegmentContainer;
-+ var calendar = t.calendar;
-+ var formatDate = calendar.formatDate;
-+ var formatDates = calendar.formatDates;
-+
-+
-+ /* Rendering
-+ --------------------------------------------------------------------*/
-+
-+ function clearEvents() {
-+ reportEventClear();
-+ getListContainer().empty();
-+ }
-+
-+ function renderEvents(events, modifiedEventId) {
-+ events.sort(sortCmp);
-+ reportEvents(events);
-+ renderSegs(compileSegs(events), modifiedEventId);
-+ }
-+
-+ function compileSegs(events) {
-+ var segs = [];
-+ var colFormat = opt('titleFormat', 'day');
-+ var firstDay = opt('firstDay');
-+ var segmode = opt('listSections');
-+ var event, i, dd, wd, md, seg, segHash, curSegHash, segDate, curSeg = -1;
-+ var today = clearTime(new Date());
-+ var weekstart = addDays(cloneDate(today), -((today.getDay() - firstDay + 7) % 7));
-+
-+ for (i=0; i < events.length; i++) {
-+ event = events[i];
-+
-+ // skip events out of range
-+ if (event.end < t.start || event.start > t.visEnd)
-+ continue;
-+
-+ // define sections of this event
-+ // create smart sections such as today, tomorrow, this week, next week, next month, ect.
-+ segDate = cloneDate(event.start < t.start && event.end > t.start ? t.start : event.start, true);
-+ dd = dayDiff(segDate, today);
-+ wd = Math.floor(dayDiff(segDate, weekstart) / 7);
-+ md = segDate.getMonth() + ((segDate.getYear() - today.getYear()) * 12) - today.getMonth();
-+
-+ // build section title
-+ if (segmode == 'smart') {
-+ if (dd < 0) {
-+ segHash = opt('listTexts', 'past');
-+ } else if (dd == 0) {
-+ segHash = opt('listTexts', 'today');
-+ } else if (dd == 1) {
-+ segHash = opt('listTexts', 'tomorrow');
-+ } else if (wd == 0) {
-+ segHash = opt('listTexts', 'thisWeek');
-+ } else if (wd == 1) {
-+ segHash = opt('listTexts', 'nextWeek');
-+ } else if (md == 0) {
-+ segHash = opt('listTexts', 'thisMonth');
-+ } else if (md == 1) {
-+ segHash = opt('listTexts', 'nextMonth');
-+ } else if (md > 1) {
-+ segHash = opt('listTexts', 'future');
-+ }
-+ } else if (segmode == 'month') {
-+ segHash = formatDate(segDate, 'MMMM yyyy');
-+ } else if (segmode == 'week') {
-+ segHash = opt('listTexts', 'week') + formatDate(segDate, ' W');
-+ } else if (segmode == 'day') {
-+ segHash = formatDate(segDate, colFormat);
-+ } else {
-+ segHash = '';
-+ }
-+
-+ // start new segment
-+ if (segHash != curSegHash) {
-+ segs[++curSeg] = { events: [], start: segDate, title: segHash, daydiff: dd, weekdiff: wd, monthdiff: md };
-+ curSegHash = segHash;
-+ }
-+
-+ segs[curSeg].events.push(event);
-+ }
-+
-+ return segs;
-+ }
-+
-+ function sortCmp(a, b) {
-+ var sd = a.start.getTime() - b.start.getTime();
-+ return sd + (sd ? 0 : a.end.getTime() - b.end.getTime());
-+ }
-+
-+ function renderSegs(segs, modifiedEventId) {
-+ var tm = opt('theme') ? 'ui' : 'fc';
-+ var headerClass = tm + "-widget-header";
-+ var contentClass = tm + "-widget-content";
-+ var i, j, seg, event, times, s, skinCss, skinCssAttr, classes, segContainer, eventElements;
-+
-+ for (j=0; j < segs.length; j++) {
-+ seg = segs[j];
-+
-+ if (seg.title) {
-+ $('<div class="fc-list-header ' + headerClass + '">' + htmlEscape(seg.title) + '</div>').appendTo(getListContainer());
-+ }
-+ segContainer = $('<div>').addClass('fc-list-section ' + contentClass).appendTo(getListContainer());
-+ s = '';
-+
-+ for (i=0; i < seg.events.length; i++) {
-+ event = seg.events[i];
-+ times = renderEventTime(event, seg);
-+ skinCss = getSkinCss(event, opt);
-+ skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
-+ classes = ['fc-event', 'fc-event-skin', 'fc-event-vert', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
-+ if (event.source && event.source.className) {
-+ classes = classes.concat(event.source.className);
-+ }
-+
-+ s +=
-+ "<div class='" + classes.join(' ') + "'" + skinCssAttr + ">" +
-+ "<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
-+ "<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
-+ "<div class='fc-event-time'>" +
-+ (times[0] ? '<span class="fc-col-date">' + times[0] + '</span> ' : '') +
-+ (times[1] ? '<span class="fc-col-time">' + times[1] + '</span>' : '') +
-+ "</div>" +
-+ "</div>" +
-+ "<div class='fc-event-content'>" +
-+ "<div class='fc-event-title'>" +
-+ htmlEscape(event.title) +
-+ "</div>" +
-+ "</div>" +
-+ "<div class='fc-event-bg'></div>" +
-+ "</div>" + // close inner
-+ "</div>"; // close outer
-+ }
-+
-+ segContainer[0].innerHTML = s;
-+ eventElements = segContainer.children();
-+
-+ // retrieve elements, run through eventRender callback, bind event handlers
-+ for (i=0; i < seg.events.length; i++) {
-+ event = seg.events[i];
-+ eventElement = $(eventElements[i]); // faster than eq()
-+ triggerRes = trigger('eventRender', event, event, eventElement);
-+ if (triggerRes === false) {
-+ eventElement.remove();
-+ } else {
-+ if (triggerRes && triggerRes !== true) {
-+ eventElement.remove();
-+ eventElement = $(triggerRes).appendTo(segContainer);
-+ }
-+ if (event._id === modifiedEventId) {
-+ eventElementHandlers(event, eventElement, seg);
-+ } else {
-+ eventElement[0]._fci = i; // for lazySegBind
-+ }
-+ reportEventElement(event, eventElement);
-+ }
-+ }
-+
-+ lazySegBind(segContainer, seg, eventElementHandlers);
-+ }
-+
-+ markFirstLast(getListContainer());
-+ }
-+
-+ // event time/date range to display
-+ function renderEventTime(event, seg) {
-+ var timeFormat = opt('timeFormat');
-+ var dateFormat = opt('columnFormat');
-+ var segmode = opt('listSections');
-+ var duration = event.end.getTime() - event.start.getTime();
-+ var datestr = '', timestr = '';
-+
-+ if (segmode == 'smart') {
-+ if (event.start < seg.start) {
-+ datestr = opt('listTexts', 'until') + ' ' + formatDate(event.end, (event.allDay || event.end.getDate() != seg.start.getDate()) ? dateFormat : timeFormat);
-+ } else if (duration > DAY_MS) {
-+ datestr = formatDates(event.start, event.end, dateFormat + '{ - ' + dateFormat + '}');
-+ } else if (seg.daydiff == 0) {
-+ datestr = opt('listTexts', 'today');
-+ } else if (seg.daydiff == 1) {
-+ datestr = opt('listTexts', 'tomorrow');
-+ } else if (seg.weekdiff == 0 || seg.weekdiff == 1) {
-+ datestr = formatDate(event.start, 'dddd');
-+ } else if (seg.daydiff > 1 || seg.daydiff < 0) {
-+ datestr = formatDate(event.start, dateFormat);
-+ }
-+ } else if (segmode != 'day') {
-+ datestr = formatDates(event.start, event.end, dateFormat + (duration > DAY_MS ? '{ - ' + dateFormat + '}' : ''));
-+ }
-+
-+ if (!datestr && event.allDay) {
-+ timestr = opt('allDayText');
-+ } else if ((duration < DAY_MS || !datestr) && !event.allDay) {
-+ timestr = formatDates(event.start, event.end, timeFormat);
-+ }
-+
-+ return [datestr, timestr];
-+ }
-+
-+ function lazySegBind(container, seg, bindHandlers) {
-+ container.unbind('mouseover').mouseover(function(ev) {
-+ var parent = ev.target, e = parent, i, event;
-+ while (parent != this) {
-+ e = parent;
-+ parent = parent.parentNode;
-+ }
-+ if ((i = e._fci) !== undefined) {
-+ e._fci = undefined;
-+ event = seg.events[i];
-+ bindHandlers(event, container.children().eq(i), seg);
-+ $(ev.target).trigger(ev);
-+ }
-+ ev.stopPropagation();
-+ });
-+ }
-+
-+}
-+
-+
-+fcViews.list = ListView;
-+
-+
-+function ListView(element, calendar) {
-+ var t = this;
-+
-+ // exports
-+ t.render = render;
-+ t.select = dummy;
-+ t.unselect = dummy;
-+ t.getDaySegmentContainer = function(){ return body; };
-+
-+ // imports
-+ View.call(t, element, calendar, 'list');
-+ ListEventRenderer.call(t);
-+ var opt = t.opt;
-+ var trigger = t.trigger;
-+ var clearEvents = t.clearEvents;
-+ var reportEventClear = t.reportEventClear;
-+ var formatDates = calendar.formatDates;
-+ var formatDate = calendar.formatDate;
-+
-+ // overrides
-+ t.setWidth = setWidth;
-+ t.setHeight = setHeight;
-+
-+ // locals
-+ var body;
-+ var firstDay;
-+ var nwe;
-+ var tm;
-+ var colFormat;
-+
-+
-+ function render(date, delta) {
-+ if (delta) {
-+ addDays(date, opt('listPage') * delta);
-+ }
-+ t.start = t.visStart = cloneDate(date, true);
-+ t.end = addDays(cloneDate(t.start), opt('listPage'));
-+ t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
-+ addMinutes(t.visEnd, -1); // set end to 23:59
-+ t.title = formatDates(date, t.visEnd, opt('titleFormat'));
-+
-+ updateOptions();
-+
-+ if (!body) {
-+ buildSkeleton();
-+ } else {
-+ clearEvents();
-+ }
-+ }
-+
-+
-+ function updateOptions() {
-+ firstDay = opt('firstDay');
-+ nwe = opt('weekends') ? 0 : 1;
-+ tm = opt('theme') ? 'ui' : 'fc';
-+ colFormat = opt('columnFormat', 'day');
-+ }
-+
-+
-+ function buildSkeleton() {
-+ body = $('<div>').addClass('fc-list-content').appendTo(element);
-+ }
-+
-+ function setHeight(height, dateChanged) {
-+ body.css('height', (height-1)+'px').css('overflow', 'auto');
-+ }
-+
-+ function setWidth(width) {
-+ // nothing to be done here
-+ }
-+
-+ function dummy() {
-+ // Stub.
-+ }
-+
-+}
-+
-+
-+/* Additional view: table (by bruederli at kolabsys.com)
-+---------------------------------------------------------------------------------*/
-+
-+function TableEventRenderer() {
-+ var t = this;
-+
-+ // imports
-+ ListEventRenderer.call(t);
-+ var opt = t.opt;
-+ var sortCmp = t.sortCmp;
-+ var trigger = t.trigger;
-+ var compileSegs = t.compileDaySegs;
-+ var reportEvents = t.reportEvents;
-+ var reportEventClear = t.reportEventClear;
-+ var reportEventElement = t.reportEventElement;
-+ var eventElementHandlers = t.eventElementHandlers;
-+ var renderEventTime = t.renderEventTime;
-+ var showEvents = t.showEvents;
-+ var hideEvents = t.hideEvents;
-+ var getListContainer = t.getDaySegmentContainer;
-+ var lazySegBind = t.lazySegBind;
-+ var calendar = t.calendar;
-+ var formatDate = calendar.formatDate;
-+ var formatDates = calendar.formatDates;
-+
-+ // exports
-+ t.renderEvents = renderEvents;
-+ t.clearEvents = clearEvents;
-+
-+
-+ /* Rendering
-+ --------------------------------------------------------------------*/
-+
-+ function clearEvents() {
-+ reportEventClear();
-+ getListContainer().children('tbody').remove();
-+ }
-+
-+ function renderEvents(events, modifiedEventId) {
-+ events.sort(sortCmp);
-+ reportEvents(events);
-+ renderSegs(compileSegs(events), modifiedEventId);
-+ getListContainer().removeClass('fc-list-smart fc-list-day fc-list-month fc-list-week').addClass('fc-list-' + opt('listSections'));
-+ }
-+
-+ function renderSegs(segs, modifiedEventId) {
-+ var tm = opt('theme') ? 'ui' : 'fc';
-+ var table = getListContainer();
-+ var headerClass = tm + "-widget-header";
-+ var contentClass = tm + "-widget-content";
-+ var tableCols = opt('tableCols');
-+ var timecol = $.inArray('time', tableCols) >= 0;
-+ var i, j, seg, event, times, s, skinCss, skinCssAttr, skinClasses, rowClasses, segContainer, eventElements;
-+
-+ for (j=0; j < segs.length; j++) {
-+ seg = segs[j];
-+
-+ if (seg.title) {
-+ $('<tbody class="fc-list-header"><tr><td class="fc-list-header ' + headerClass + '" colspan="' + tableCols.length + '">' + htmlEscape(seg.title) + '</td></tr></tbody>').appendTo(table);
-+ }
-+ segContainer = $('<tbody>').addClass('fc-list-section ' + contentClass).appendTo(table);
-+ s = '';
-+
-+ for (i=0; i < seg.events.length; i++) {
-+ event = seg.events[i];
-+ times = renderEventTime(event, seg);
-+ skinCss = getSkinCss(event, opt);
-+ skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
-+ skinClasses = ['fc-event-skin', 'fc-corner-left', 'fc-corner-right', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
-+ if (event.source && event.source.className) {
-+ skinClasses = skinClasses.concat(event.source.className);
-+ }
-+ rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]];
-+ if (seg.daydiff == 0) {
-+ rowClasses.push('fc-today');
-+ }
-+
-+ s += "<tr class='" + rowClasses.join(' ') + "'>";
-+ for (var col, c=0; c < tableCols.length; c++) {
-+ col = tableCols[c];
-+ if (col == 'handle') {
-+ s += "<td class='fc-event-handle'>" +
-+ "<div class='" + skinClasses.join(' ') + "'" + skinCssAttr + ">" +
-+ "<span class='fc-event-inner'></span>" +
-+ "</div></td>";
-+ } else if (col == 'date') {
-+ s += "<td class='fc-event-date' colspan='" + (times[1] || !timecol ? 1 : 2) + "'>" + htmlEscape(times[0]) + "</td>";
-+ } else if (col == 'time') {
-+ if (times[1]) {
-+ s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
-+ }
-+ } else {
-+ s += "<td class='fc-event-" + col + "'>" + (htmlEscape(event[col]) || ' ') + "</td>";
-+ }
-+ }
-+ s += "</tr>";
-+
-+ // IE doesn't like innerHTML on tbody elements so we insert every row individually
-+ if (document.all) {
-+ $(s).appendTo(segContainer);
-+ s = '';
-+ }
-+ }
-+
-+ if (!document.all)
-+ segContainer[0].innerHTML = s;
-+
-+ eventElements = segContainer.children();
-+
-+ // retrieve elements, run through eventRender callback, bind event handlers
-+ for (i=0; i < seg.events.length; i++) {
-+ event = seg.events[i];
-+ eventElement = $(eventElements[i]); // faster than eq()
-+ triggerRes = trigger('eventRender', event, event, eventElement);
-+ if (triggerRes === false) {
-+ eventElement.remove();
-+ } else {
-+ if (triggerRes && triggerRes !== true) {
-+ eventElement.remove();
-+ eventElement = $(triggerRes).appendTo(segContainer);
-+ }
-+ if (event._id === modifiedEventId) {
-+ eventElementHandlers(event, eventElement, seg);
-+ } else {
-+ eventElement[0]._fci = i; // for lazySegBind
-+ }
-+ reportEventElement(event, eventElement);
-+ }
-+ }
-+
-+ lazySegBind(segContainer, seg, eventElementHandlers);
-+ markFirstLast(segContainer);
-+ }
-+
-+ //markFirstLast(table);
-+ }
-+
-+}
-+
-+
-+fcViews.table = TableView;
-+
-+
-+function TableView(element, calendar) {
-+ var t = this;
-+
-+ // exports
-+ t.render = render;
-+ t.select = dummy;
-+ t.unselect = dummy;
-+ t.getDaySegmentContainer = function(){ return table; };
-+
-+ // imports
-+ View.call(t, element, calendar, 'table');
-+ TableEventRenderer.call(t);
-+ var opt = t.opt;
-+ var trigger = t.trigger;
-+ var clearEvents = t.clearEvents;
-+ var reportEventClear = t.reportEventClear;
-+ var formatDates = calendar.formatDates;
-+ var formatDate = calendar.formatDate;
-+
-+ // overrides
-+ t.setWidth = setWidth;
-+ t.setHeight = setHeight;
-+
-+ // locals
-+ var div;
-+ var table;
-+ var firstDay;
-+ var nwe;
-+ var tm;
-+ var colFormat;
-+
-+
-+ function render(date, delta) {
-+ if (delta) {
-+ addDays(date, opt('listPage') * delta);
-+ }
-+ t.start = t.visStart = cloneDate(date, true);
-+ t.end = addDays(cloneDate(t.start), opt('listPage'));
-+ t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
-+ addMinutes(t.visEnd, -1); // set end to 23:59
-+ t.title = (t.visEnd.getTime() - t.visStart.getTime() < DAY_MS) ? formatDate(date, opt('titleFormat')) : formatDates(date, t.visEnd, opt('titleFormat'));
-+
-+ updateOptions();
-+
-+ if (!table) {
-+ buildSkeleton();
-+ } else {
-+ clearEvents();
-+ }
-+ }
-+
-+
-+ function updateOptions() {
-+ firstDay = opt('firstDay');
-+ nwe = opt('weekends') ? 0 : 1;
-+ tm = opt('theme') ? 'ui' : 'fc';
-+ colFormat = opt('columnFormat');
-+ }
-+
-+
-+ function buildSkeleton() {
-+ var tableCols = opt('tableCols');
-+ var s =
-+ "<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
-+ "<colgroup>";
-+ for (var c=0; c < tableCols.length; c++) {
-+ s += "<col class='fc-event-" + tableCols[c] + "' />";
-+ }
-+ s += "</colgroup>" +
-+ "</table>";
-+ div = $('<div>').addClass('fc-list-content').appendTo(element);
-+ table = $(s).appendTo(div);
-+ }
-+
-+ function setHeight(height, dateChanged) {
-+ div.css('height', (height-1)+'px').css('overflow', 'auto');
-+ }
-+
-+ function setWidth(width) {
-+ // nothing to be done here
-+ }
-+
-+ function dummy() {
-+ // Stub.
-+ }
-+
-+}
-+
-+
-+})(jQuery);
-\ No newline at end of file
diff --git a/plugins/calendar/lib/js/fullcalendar.js b/plugins/calendar/lib/js/fullcalendar.js
index 79a2b7f..2150126 100644
--- a/plugins/calendar/lib/js/fullcalendar.js
+++ b/plugins/calendar/lib/js/fullcalendar.js
@@ -1,52 +1,20 @@
-/**
- * @preserve
- * FullCalendar v1.5.4-rcube-0.9.0
- * https://github.com/roundcube/fullcalendar
- *
+/*!
+ * FullCalendar v1.6.4-rcube-1.0
+ * Docs & License: http://arshaw.com/fullcalendar/
+ * (c) 2013 Adam Shaw, 2014 Kolab Systems AG
+ */
+
+/*
* Use fullcalendar.css for basic styling.
* For event drag & drop, requires jQuery UI draggable.
* For event resizing, requires jQuery UI resizable.
- *
- * Copyright (c) 2011 Adam Shaw
- * Copyright (c) 2011, Kolab Systems AG
- * Dual licensed under the MIT and GPL licenses
- *
- * @licstart The following is the entire license notice for the
- * JavaScript code in this file.
- *
- * Copyright (c) Copyright (c) Jon Nylander
- *
- * Licensed under the MIT licenses
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * @licend The above is the entire license notice
- * for the JavaScript code in this file.
- *
- * Date: Wed Nov 7 16:28:11 2012 +0100
- *
*/
(function($, undefined) {
+;;
+
var defaults = {
// display
@@ -58,6 +26,9 @@ var defaults = {
right: 'today prev,next'
},
weekends: true,
+ weekNumbers: false,
+ weekNumberCalculation: 'iso',
+ weekNumberTitle: 'W',
currentTimeIndicator: false,
// editing
@@ -100,10 +71,10 @@ var defaults = {
dayNames: ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
dayNamesShort: ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'],
buttonText: {
- prev: ' ◄ ',
- next: ' ► ',
- prevYear: ' << ',
- nextYear: ' >> ',
+ prev: "<span class='fc-text-arrow'>‹</span>",
+ next: "<span class='fc-text-arrow'>›</span>",
+ prevYear: "<span class='fc-text-arrow'>«</span>",
+ nextYear: "<span class='fc-text-arrow'>»</span>",
today: 'today',
month: 'month',
week: 'week',
@@ -140,7 +111,9 @@ var defaults = {
//selectable: false,
unselectAuto: true,
- dropAccept: '*'
+ dropAccept: '*',
+
+ handleWindowResize: true
};
@@ -152,10 +125,10 @@ var rtlDefaults = {
right: 'title'
},
buttonText: {
- prev: ' ► ',
- next: ' ◄ ',
- prevYear: ' >> ',
- nextYear: ' << '
+ prev: "<span class='fc-text-arrow'>›</span>",
+ next: "<span class='fc-text-arrow'>‹</span>",
+ prevYear: "<span class='fc-text-arrow'>»</span>",
+ nextYear: "<span class='fc-text-arrow'>«</span>"
},
buttonIcons: {
prev: 'circle-triangle-e',
@@ -165,7 +138,9 @@ var rtlDefaults = {
-var fc = $.fullCalendar = { version: "1.5.4-rcube-0.9.0" };
+;;
+
+var fc = $.fullCalendar = { version: "1.6.4-rcube-1.0" };
var fcViews = fc.views = {};
@@ -193,7 +168,8 @@ $.fn.fullCalendar = function(options) {
}
return this;
}
-
+
+ options = options || {};
// would like to have this logic in EventManager, but needs to happen before options are recursively extended
var eventSources = options.eventSources || [];
@@ -231,6 +207,8 @@ function setDefaults(d) {
+;;
+
function Calendar(element, options, eventSources) {
var t = this;
@@ -275,10 +253,8 @@ function Calendar(element, options, eventSources) {
var content;
var tm; // for making theme classes
var currentView;
- var viewInstances = {};
var elementOuterWidth;
var suggestedViewHeight;
- var absoluteViewElement;
var resizeUID = 0;
var ignoreWindowResize = 0;
var date = new Date();
@@ -297,11 +273,11 @@ function Calendar(element, options, eventSources) {
function render(inc) {
if (!content) {
initialRender();
- }else{
+ }
+ else if (elementVisible()) {
+ // mainly for the public API
calcSize();
- markSizesDirty();
- markEventsDirty();
- renderView(inc);
+ _renderView(inc);
}
}
@@ -312,18 +288,28 @@ function Calendar(element, options, eventSources) {
if (options.isRTL) {
element.addClass('fc-rtl');
}
+ else {
+ element.addClass('fc-ltr');
+ }
if (options.theme) {
element.addClass('ui-widget');
}
+
content = $("<div class='fc-content' style='position:relative'/>")
.prependTo(element);
+
header = new Header(t, options);
headerElement = header.render();
if (headerElement) {
element.prepend(headerElement);
}
+
changeView(options.defaultView);
- $(window).resize(windowResize);
+
+ if (options.handleWindowResize) {
+ $(window).resize(windowResize);
+ }
+
// needed for IE in a 0x0 iframe, b/c when it is resized, never triggers a windowResize
if (!bodyVisible()) {
lateRender();
@@ -343,21 +329,27 @@ function Calendar(element, options, eventSources) {
function destroy() {
+
+ if (currentView) {
+ trigger('viewDestroy', currentView, currentView, currentView.element);
+ currentView.triggerEventDestroy();
+ }
+
$(window).unbind('resize', windowResize);
+
header.destroy();
content.remove();
element.removeClass('fc fc-rtl ui-widget');
}
-
function elementVisible() {
- return _element.offsetWidth !== 0;
+ return element.is(':visible');
}
function bodyVisible() {
- return $('body')[0].offsetWidth !== 0;
+ return $('body').is(':visible');
}
@@ -365,115 +357,89 @@ function Calendar(element, options, eventSources) {
/* View Rendering
-----------------------------------------------------------------------------*/
- // TODO: improve view switching (still weird transition in IE, and FF has whiteout problem)
-
+
function changeView(newViewName) {
if (!currentView || newViewName != currentView.name) {
- ignoreWindowResize++; // because setMinHeight might change the height before render (and subsequently setSize) is reached
+ _changeView(newViewName);
+ }
+ }
+
+
+ function _changeView(newViewName) {
+ ignoreWindowResize++;
+ if (currentView) {
+ trigger('viewDestroy', currentView, currentView, currentView.element);
unselect();
-
- var oldView = currentView;
- var newViewElement;
-
- if (oldView) {
- (oldView.beforeHide || noop)(); // called before changing min-height. if called after, scroll state is reset (in Opera)
- setMinHeight(content, content.height());
- oldView.element.hide();
- }else{
- setMinHeight(content, 1); // needs to be 1 (not 0) for IE7, or else view dimensions miscalculated
- }
- content.css('overflow', 'hidden');
-
- currentView = viewInstances[newViewName];
- if (currentView) {
- currentView.element.show();
- }else{
- currentView = viewInstances[newViewName] = new fcViews[newViewName](
- newViewElement = absoluteViewElement =
- $("<div class='fc-view fc-view-" + newViewName + "' style='position:absolute'/>")
- .appendTo(content),
- t // the calendar object
- );
- }
-
- if (oldView) {
- header.deactivateButton(oldView.name);
- }
- header.activateButton(newViewName);
-
- renderView(); // after height has been set, will make absoluteViewElement's position=relative, then set to null
-
- content.css('overflow', '');
- if (oldView) {
- setMinHeight(content, 1);
- }
-
- if (!newViewElement) {
- (currentView.afterShow || noop)(); // called after setting min-height/overflow, so in final scroll state (for Opera)
- }
-
- ignoreWindowResize--;
+ currentView.triggerEventDestroy(); // trigger 'eventDestroy' for each event
+ freezeContentHeight();
+ currentView.element.remove();
+ header.deactivateButton(currentView.name);
}
+
+ header.activateButton(newViewName);
+
+ currentView = new fcViews[newViewName](
+ $("<div class='fc-view fc-view-" + newViewName + "' style='position:relative'/>")
+ .appendTo(content),
+ t // the calendar object
+ );
+
+ renderView();
+ unfreezeContentHeight();
+
+ ignoreWindowResize--;
}
-
-
-
+
+
function renderView(inc) {
- if (elementVisible()) {
- ignoreWindowResize++; // because renderEvents might temporarily change the height before setSize is reached
+ if (
+ !currentView.start || // never rendered before
+ inc || date < currentView.start || date >= currentView.end // or new date range
+ ) {
+ if (elementVisible()) {
+ _renderView(inc);
+ }
+ }
+ }
+
+
+ function _renderView(inc) { // assumes elementVisible
+ ignoreWindowResize++;
+ if (currentView.start) { // already been rendered?
+ trigger('viewDestroy', currentView, currentView, currentView.element);
unselect();
-
- if (suggestedViewHeight === undefined) {
- calcSize();
- }
-
- var forceEventRender = false;
- if (!currentView.start || inc || date < currentView.start || date >= currentView.end) {
- // view must render an entire new date range (and refetch/render events)
- currentView.render(date, inc || 0); // responsible for clearing events
- setSize(true);
- forceEventRender = true;
- }
- else if (currentView.sizeDirty) {
- // view must resize (and rerender events)
- currentView.clearEvents();
- setSize();
- forceEventRender = true;
- }
- else if (currentView.eventsDirty) {
- currentView.clearEvents();
- forceEventRender = true;
- }
- currentView.sizeDirty = false;
- currentView.eventsDirty = false;
- updateEvents(forceEventRender);
-
- elementOuterWidth = element.outerWidth();
-
- header.updateTitle(currentView.title);
- var today = new Date();
- if (today >= currentView.start && today < currentView.end) {
- header.disableButton('today');
- }else{
- header.enableButton('today');
- }
-
- ignoreWindowResize--;
- currentView.trigger('viewDisplay', _element);
+ clearEvents();
}
+
+ freezeContentHeight();
+ currentView.render(date, inc || 0); // the view's render method ONLY renders the skeleton, nothing else
+ setSize();
+ unfreezeContentHeight();
+ (currentView.afterRender || noop)();
+
+ updateTitle();
+ updateTodayButton();
+
+ trigger('viewRender', currentView, currentView, currentView.element);
+ currentView.trigger('viewDisplay', _element); // deprecated
+
+ ignoreWindowResize--;
+
+ getAndRenderEvents();
}
-
+
/* Resizing
-----------------------------------------------------------------------------*/
function updateSize() {
- markSizesDirty();
if (elementVisible()) {
+ unselect();
+ clearEvents();
calcSize();
setSize();
unselect();
@@ -485,14 +451,7 @@ function Calendar(element, options, eventSources) {
}
- function markSizesDirty() {
- $.each(viewInstances, function(i, inst) {
- inst.sizeDirty = true;
- });
- }
-
-
- function calcSize() {
+ function calcSize() { // assumes elementVisible
if (options.contentHeight) {
suggestedViewHeight = options.contentHeight;
}
@@ -505,15 +464,20 @@ function Calendar(element, options, eventSources) {
}
- function setSize(dateChanged) { // todo: dateChanged?
- ignoreWindowResize++;
- currentView.setHeight(suggestedViewHeight, dateChanged);
- if (absoluteViewElement) {
- absoluteViewElement.css('position', 'relative');
- absoluteViewElement = null;
+ function setSize() { // assumes elementVisible
+
+ if (suggestedViewHeight === undefined) {
+ calcSize(); // for first time
+ // NOTE: we don't want to recalculate on every renderView because
+ // it could result in oscillating heights due to scrollbars.
}
- currentView.setWidth(content.width(), dateChanged);
+
+ ignoreWindowResize++;
+ currentView.setHeight(suggestedViewHeight);
+ currentView.setWidth(content.width());
ignoreWindowResize--;
+
+ elementOuterWidth = element.outerWidth();
}
@@ -542,53 +506,90 @@ function Calendar(element, options, eventSources) {
/* Event Fetching/Rendering
-----------------------------------------------------------------------------*/
+ // TODO: going forward, most of this stuff should be directly handled by the view
+
+
+ function refetchEvents() { // can be called as an API method
+ clearEvents();
+ fetchAndRenderEvents();
+ }
+
+
+ function rerenderEvents(modifiedEventID) { // can be called as an API method
+ clearEvents();
+ renderEvents(modifiedEventID);
+ }
+
+
+ function renderEvents(modifiedEventID) { // TODO: remove modifiedEventID hack
+ if (elementVisible()) {
+ currentView.setEventData(events); // for View.js, TODO: unify with renderEvents
+ currentView.renderEvents(events, modifiedEventID); // actually render the DOM elements
+ currentView.trigger('eventAfterAllRender');
+ }
+ }
+
+
+ function clearEvents() {
+ currentView.triggerEventDestroy(); // trigger 'eventDestroy' for each event
+ currentView.clearEvents(); // actually remove the DOM elements
+ currentView.clearEventData(); // for View.js, TODO: unify with clearEvents
+ }
-
- // fetches events if necessary, rerenders events if necessary (or if forced)
- function updateEvents(forceRender) {
+
+ function getAndRenderEvents() {
if (!options.lazyFetching || isFetchNeeded(currentView.visStart, currentView.visEnd)) {
- refetchEvents();
+ fetchAndRenderEvents();
}
- else if (forceRender) {
- rerenderEvents();
+ else {
+ renderEvents();
}
}
-
-
+
+
+ function fetchAndRenderEvents() {
+ fetchEvents(currentView.visStart, currentView.visEnd);
+ // ... will call reportEvents
+ // ... which will call renderEvents
+ }
+
+
function refetchEvents(source) {
fetchEvents(currentView.visStart, currentView.visEnd, source); // will call reportEvents
}
-
+
// called when event data arrives
function reportEvents(_events) {
events = _events;
- rerenderEvents();
+ renderEvents();
}
-
-
+
+
// called when a single event's data has been changed
function reportEventChange(eventID) {
rerenderEvents(eventID);
}
-
-
- // attempts to rerenderEvents
- function rerenderEvents(modifiedEventID) {
- markEventsDirty();
- if (elementVisible()) {
- currentView.clearEvents();
- currentView.trigger('viewRender', currentView);
- currentView.renderEvents(events, modifiedEventID);
- currentView.eventsDirty = false;
- }
+
+
+
+ /* Header Updating
+ -----------------------------------------------------------------------------*/
+
+
+ function updateTitle() {
+ header.updateTitle(currentView.title);
}
-
-
- function markEventsDirty() {
- $.each(viewInstances, function(i, inst) {
- inst.eventsDirty = true;
- });
+
+
+ function updateTodayButton() {
+ var today = new Date();
+ if (today >= currentView.start && today < currentView.end) {
+ header.disableButton('today');
+ }
+ else {
+ header.enableButton('today');
+ }
}
@@ -669,6 +670,29 @@ function Calendar(element, options, eventSources) {
function getDate() {
return cloneDate(date);
}
+
+
+
+ /* Height "Freezing"
+ -----------------------------------------------------------------------------*/
+
+
+ function freezeContentHeight() {
+ content.css({
+ width: '100%',
+ height: content.height(),
+ overflow: 'hidden'
+ });
+ }
+
+
+ function unfreezeContentHeight() {
+ content.css({
+ width: '',
+ height: '',
+ overflow: ''
+ });
+ }
@@ -735,6 +759,8 @@ function Calendar(element, options, eventSources) {
}
+;;
+
function Header(calendar, options) {
var t = this;
@@ -808,54 +834,47 @@ function Header(calendar, options) {
var text = smartProperty(options.buttonText, buttonName); // why are we using smartProperty here?
var button = $(
"<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default'>" +
- "<span class='fc-button-inner'>" +
- "<span class='fc-button-content'>" +
- (icon ?
- "<span class='fc-icon-wrap'>" +
- "<span class='ui-icon ui-icon-" + icon + "'/>" +
- "</span>" :
- text
- ) +
- "</span>" +
- "<span class='fc-button-effect'><span></span></span>" +
- "</span>" +
+ (icon ?
+ "<span class='fc-icon-wrap'>" +
+ "<span class='ui-icon ui-icon-" + icon + "'/>" +
+ "</span>" :
+ text
+ ) +
"</span>"
- );
- if (button) {
- button
- .click(function() {
- if (!button.hasClass(tm + '-state-disabled')) {
- buttonClick();
- }
- })
- .mousedown(function() {
+ )
+ .click(function() {
+ if (!button.hasClass(tm + '-state-disabled')) {
+ buttonClick();
+ }
+ })
+ .mousedown(function() {
+ button
+ .not('.' + tm + '-state-active')
+ .not('.' + tm + '-state-disabled')
+ .addClass(tm + '-state-down');
+ })
+ .mouseup(function() {
+ button.removeClass(tm + '-state-down');
+ })
+ .hover(
+ function() {
button
.not('.' + tm + '-state-active')
.not('.' + tm + '-state-disabled')
- .addClass(tm + '-state-down');
- })
- .mouseup(function() {
- button.removeClass(tm + '-state-down');
- })
- .hover(
- function() {
- button
- .not('.' + tm + '-state-active')
- .not('.' + tm + '-state-disabled')
- .addClass(tm + '-state-hover');
- },
- function() {
- button
- .removeClass(tm + '-state-hover')
- .removeClass(tm + '-state-down');
- }
- )
- .appendTo(e);
- if (!prevButton) {
- button.addClass(tm + '-corner-left');
- }
- prevButton = button;
+ .addClass(tm + '-state-hover');
+ },
+ function() {
+ button
+ .removeClass(tm + '-state-hover')
+ .removeClass(tm + '-state-down');
+ }
+ )
+ .appendTo(e);
+ disableTextSelection(button);
+ if (!prevButton) {
+ button.addClass(tm + '-corner-left');
}
+ prevButton = button;
}
}
});
@@ -900,6 +919,8 @@ function Header(calendar, options) {
}
+;;
+
fc.sourceNormalizers = [];
fc.sourceFetchers = [];
@@ -978,6 +999,16 @@ function EventManager(options, _sources) {
_fetchEventSource(source, function(events) {
if (fetchID == currentFetchID) {
if (events) {
+
+ if (options.eventDataTransform) {
+ events = $.map(events, options.eventDataTransform);
+ }
+ if (source.eventDataTransform) {
+ events = $.map(events, source.eventDataTransform);
+ }
+ // TODO: this technique is not ideal for static array event sources.
+ // For arrays, we'll want to process all events right in the beginning, then never again.
+
for (var i=0; i<events.length; i++) {
events[i].source = source;
normalizeEvent(events[i]);
@@ -1030,7 +1061,22 @@ function EventManager(options, _sources) {
var success = source.success;
var error = source.error;
var complete = source.complete;
- var data = $.extend({}, source.data || {});
+
+ // retrieve any outbound GET/POST $.ajax data from the options
+ var customData;
+ if ($.isFunction(source.data)) {
+ // supplied as a function that returns a key/value object
+ customData = source.data();
+ }
+ else {
+ // supplied as a straight key/value object
+ customData = source.data;
+ }
+
+ // use a copy of the custom data so we can modify the parameters
+ // and not affect the passed-in object.
+ var data = $.extend({}, customData || {});
+
var startParam = firstDefined(source.startParam, options.startParam);
var endParam = firstDefined(source.endParam, options.endParam);
if (startParam) {
@@ -1039,6 +1085,7 @@ function EventManager(options, _sources) {
if (endParam) {
data[endParam] = Math.round(+rangeEnd / 1000);
}
+
pushLoading();
$.ajax($.extend({}, ajaxDefaults, source, {
data: data,
@@ -1138,7 +1185,7 @@ function EventManager(options, _sources) {
e.className = event.className;
e.editable = event.editable;
e.color = event.color;
- e.backgroudColor = event.backgroudColor;
+ e.backgroundColor = event.backgroundColor;
e.borderColor = event.borderColor;
e.textColor = event.textColor;
normalizeEvent(e);
@@ -1212,14 +1259,14 @@ function EventManager(options, _sources) {
function pushLoading() {
if (!loadingLevel++) {
- trigger('loading', null, true);
+ trigger('loading', null, true, getView());
}
}
function popLoading() {
if (!--loadingLevel) {
- trigger('loading', null, false);
+ trigger('loading', null, false, getView());
}
}
@@ -1292,6 +1339,8 @@ function EventManager(options, _sources) {
}
+;;
+
fc.addDays = addDays;
fc.cloneDate = cloneDate;
@@ -1396,15 +1445,6 @@ function zeroDate() { // returns a Date with time 00:00:00 and dateOfMonth=1
}
-function skipWeekend(date, inc, excl) {
- inc = inc || 1;
- while (!date.getDay() || (excl && date.getDay()==1 || !excl && date.getDay()==6)) {
- addDays(date, inc);
- }
- return date;
-}
-
-
function dayDiff(d1, d2) { // d1 - d2
return Math.round((cloneDate(d1, true) - cloneDate(d2, true)) / DAY_MS);
}
@@ -1646,10 +1686,35 @@ var dateFormatters = {
return 'th';
}
return ['st', 'nd', 'rd'][date%10-1] || 'th';
- } ,
- W : function(d) { return iso8601Week(d); }
+ },
+ w : function(d, o) { // local
+ return o.weekNumberCalculation(d);
+ },
+ W : function(d) { // ISO
+ return iso8601Week(d);
+ }
};
+fc.dateFormatters = dateFormatters;
+
+
+/* thanks jQuery UI (https://github.com/jquery/jquery-ui/blob/master/ui/jquery.ui.datepicker.js)
+ *
+ * Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+ * `date` - the date to get the week for
+ * `number` - the number of the week within the year that contains this date
+ */
+function iso8601Week(date) {
+ var time;
+ var checkDate = new Date(date.getTime());
+ // Find Thursday of this week starting on Monday
+ checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+
+ time = checkDate.getTime();
+ checkDate.setMonth(0); // Compare with Jan 1
+ checkDate.setDate(1);
+ return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+}
// Determine the week of the year based on the ISO 8601 definition.
// copied from jquery UI Datepicker
@@ -1664,6 +1729,8 @@ var iso8601Week = function(date) {
};
+;;
+
fc.applyAll = applyAll;
@@ -1683,95 +1750,7 @@ function exclEndDay(event) {
function _exclEndDay(end, allDay) {
end = cloneDate(end);
return allDay || end.getHours() || end.getMinutes() ? addDays(end, 1) : clearTime(end);
-}
-
-
-function segCmp(a, b) {
- return (b.msLength - a.msLength) * 100 + (a.event.start - b.event.start);
-}
-
-
-function segsCollide(seg1, seg2) {
- return seg1.end > seg2.start && seg1.start < seg2.end;
-}
-
-
-
-/* Event Sorting
------------------------------------------------------------------------------*/
-
-
-// event rendering utilities
-function sliceSegs(events, visEventEnds, start, end) {
- var segs = [],
- i, len=events.length, event,
- eventStart, eventEnd,
- segStart, segEnd,
- isStart, isEnd;
- for (i=0; i<len; i++) {
- event = events[i];
- eventStart = event.start;
- eventEnd = visEventEnds[i];
- if (eventEnd > start && eventStart < end) {
- if (eventStart < start) {
- segStart = cloneDate(start);
- isStart = false;
- }else{
- segStart = eventStart;
- isStart = true;
- }
- if (eventEnd > end) {
- segEnd = cloneDate(end);
- isEnd = false;
- }else{
- segEnd = eventEnd;
- isEnd = true;
- }
- segs.push({
- event: event,
- start: segStart,
- end: segEnd,
- isStart: isStart,
- isEnd: isEnd,
- msLength: segEnd - segStart
- });
- }
- }
- return segs.sort(segCmp);
-}
-
-
-// event rendering calculation utilities
-function stackSegs(segs) {
- var levels = [],
- i, len = segs.length, seg,
- j, collide, k;
- for (i=0; i<len; i++) {
- seg = segs[i];
- j = 0; // the level index where seg should belong
- while (true) {
- collide = false;
- if (levels[j]) {
- for (k=0; k<levels[j].length; k++) {
- if (segsCollide(levels[j][k], seg)) {
- collide = true;
- break;
- }
- }
- }
- if (collide) {
- j++;
- }else{
- break;
- }
- }
- if (levels[j]) {
- levels[j].push(seg);
- }else{
- levels[j] = [seg];
- }
- }
- return levels;
+ // why don't we check for seconds/ms too?
}
@@ -1866,15 +1845,6 @@ function vborders(element) {
}
-function setMinHeight(element, height) {
- height = (typeof height == 'number' ? height + 'px' : height);
- element.each(function(i, _element) {
- _element.style.cssText += ';min-height:' + height + ';_height:' + height;
- // why can't we just use .css() ? i forget
- });
-}
-
-
/* Misc Utils
-----------------------------------------------------------------------------*/
@@ -1887,7 +1857,7 @@ function setMinHeight(element, height) {
function noop() { }
-function cmp(a, b) {
+function dateCompare(a, b) {
return a - b;
}
@@ -1928,11 +1898,6 @@ function htmlEscape(s) {
}
-function cssKey(_element) {
- return _element.id + '/' + _element.className + '/' + _element.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig, '');
-}
-
-
function disableTextSelection(element) {
element
.attr('unselectable', 'on')
@@ -2031,6 +1996,8 @@ function firstDefined() {
}
+;;
+
fcViews.month = MonthView;
function MonthView(element, calendar) {
@@ -2045,44 +2012,56 @@ function MonthView(element, calendar) {
BasicView.call(t, element, calendar, 'month');
var opt = t.opt;
var renderBasic = t.renderBasic;
+ var skipHiddenDays = t.skipHiddenDays;
+ var getCellsPerWeek = t.getCellsPerWeek;
var formatDate = calendar.formatDate;
-
function render(date, delta) {
+
if (delta) {
addMonths(date, delta);
date.setDate(1);
}
+
+ var firstDay = opt('firstDay');
+
var start = cloneDate(date, true);
start.setDate(1);
+
var end = addMonths(cloneDate(start), 1);
+
var visStart = cloneDate(start);
+ addDays(visStart, -((visStart.getDay() - firstDay + 7) % 7));
+ skipHiddenDays(visStart);
+
var visEnd = cloneDate(end);
- var firstDay = opt('firstDay');
- var nwe = opt('weekends') ? 0 : 1;
- if (nwe) {
- skipWeekend(visStart);
- skipWeekend(visEnd, -1, true);
- }
- addDays(visStart, -((visStart.getDay() - Math.max(firstDay, nwe) + 7) % 7));
- addDays(visEnd, (7 - visEnd.getDay() + Math.max(firstDay, nwe)) % 7);
- var rowCnt = Math.round((visEnd - visStart) / (DAY_MS * 7));
+ addDays(visEnd, (7 - visEnd.getDay() + firstDay) % 7);
+ skipHiddenDays(visEnd, -1, true);
+
+ var colCnt = getCellsPerWeek();
+ var rowCnt = Math.round(dayDiff(visEnd, visStart) / 7); // should be no need for Math.round
+
if (opt('weekMode') == 'fixed') {
- addDays(visEnd, (6 - rowCnt) * 7);
+ addDays(visEnd, (6 - rowCnt) * 7); // add weeks to make up for it
rowCnt = 6;
}
+
t.title = formatDate(start, opt('titleFormat'));
+
t.start = start;
t.end = end;
t.visStart = visStart;
t.visEnd = visEnd;
- renderBasic(6, rowCnt, nwe ? 5 : 7, true);
+
+ renderBasic(rowCnt, colCnt, true);
}
}
+;;
+
fcViews.basicWeek = BasicWeekView;
function BasicWeekView(element, calendar) {
@@ -2097,41 +2076,48 @@ function BasicWeekView(element, calendar) {
BasicView.call(t, element, calendar, 'basicWeek');
var opt = t.opt;
var renderBasic = t.renderBasic;
+ var skipHiddenDays = t.skipHiddenDays;
+ var getCellsPerWeek = t.getCellsPerWeek;
var formatDates = calendar.formatDates;
-
function render(date, delta) {
+
if (delta) {
addDays(date, delta * 7);
}
+
var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
var end = addDays(cloneDate(start), 7);
+
var visStart = cloneDate(start);
+ skipHiddenDays(visStart);
+
var visEnd = cloneDate(end);
- var weekends = opt('weekends');
- if (!weekends) {
- skipWeekend(visStart);
- skipWeekend(visEnd, -1, true);
- }
+ skipHiddenDays(visEnd, -1, true);
+
+ var colCnt = getCellsPerWeek();
+
+ t.start = start;
+ t.end = end;
+ t.visStart = visStart;
+ t.visEnd = visEnd;
+
t.title = formatDates(
visStart,
addDays(cloneDate(visEnd), -1),
opt('titleFormat')
);
- t.start = start;
- t.end = end;
- t.visStart = visStart;
- t.visEnd = visEnd;
- renderBasic(1, 1, weekends ? 7 : 5, false);
+
+ renderBasic(1, colCnt, false);
}
}
-fcViews.basicDay = BasicDayView;
+;;
-//TODO: when calendar's date starts out on a weekend, shouldn't happen
+fcViews.basicDay = BasicDayView;
function BasicDayView(element, calendar) {
@@ -2146,26 +2132,33 @@ function BasicDayView(element, calendar) {
BasicView.call(t, element, calendar, 'basicDay');
var opt = t.opt;
var renderBasic = t.renderBasic;
+ var skipHiddenDays = t.skipHiddenDays;
var formatDate = calendar.formatDate;
-
function render(date, delta) {
+
if (delta) {
addDays(date, delta);
- if (!opt('weekends')) {
- skipWeekend(date, delta < 0 ? -1 : 1);
- }
}
+ skipHiddenDays(date, delta < 0 ? -1 : 1);
+
+ var start = cloneDate(date, true);
+ var end = addDays(cloneDate(start), 1);
+
t.title = formatDate(date, opt('titleFormat'));
- t.start = t.visStart = cloneDate(date, true);
- t.end = t.visEnd = addDays(cloneDate(t.start), 1);
- renderBasic(1, 1, 1, false);
+
+ t.start = t.visStart = start;
+ t.end = t.visEnd = end;
+
+ renderBasic(1, 1, false);
}
}
+;;
+
setDefaults({
weekMode: 'fixed'
});
@@ -2188,14 +2181,12 @@ function BasicView(element, calendar, viewName) {
t.dragStop = dragStop;
t.defaultEventEnd = defaultEventEnd;
t.getHoverListener = function() { return hoverListener };
+ t.colLeft = colLeft;
+ t.colRight = colRight;
t.colContentLeft = colContentLeft;
t.colContentRight = colContentRight;
- t.dayOfWeekCol = dayOfWeekCol;
- t.dateCell = dateCell;
- t.cellDate = cellDate;
- t.cellIsAllDay = function() { return true };
+ t.getIsCellAllDay = function() { return true };
t.allDayRow = allDayRow;
- t.allDayBounds = allDayBounds;
t.getRowCnt = function() { return rowCnt };
t.getColCnt = function() { return colCnt };
t.getColWidth = function() { return colWidth };
@@ -2209,38 +2200,45 @@ function BasicView(element, calendar, viewName) {
BasicEventRenderer.call(t);
var opt = t.opt;
var trigger = t.trigger;
- var clearEvents = t.clearEvents;
var renderOverlay = t.renderOverlay;
var clearOverlays = t.clearOverlays;
var daySelectionMousedown = t.daySelectionMousedown;
+ var cellToDate = t.cellToDate;
+ var dateToCell = t.dateToCell;
+ var rangeToSegments = t.rangeToSegments;
var formatDate = calendar.formatDate;
// locals
+ var table;
var head;
var headCells;
var body;
var bodyRows;
var bodyCells;
var bodyFirstCells;
- var bodyCellTopInners;
+ var firstRowCellInners;
+ var firstRowCellContentInners;
var daySegmentContainer;
var viewWidth;
var viewHeight;
var colWidth;
+ var weekNumberWidth;
var rowCnt, colCnt;
+ var showNumbers;
var coordinateGrid;
var hoverListener;
+ var colPositions;
var colContentPositions;
- var rtl, dis, dit;
- var firstDay;
- var nwe;
var tm;
var colFormat;
+ var showWeekNumbers;
+ var weekNumberTitle;
+ var weekNumberFormat;
@@ -2251,154 +2249,212 @@ function BasicView(element, calendar, viewName) {
disableTextSelection(element.addClass('fc-grid'));
- function renderBasic(maxr, r, c, showNumbers) {
- rowCnt = r;
- colCnt = c;
+ function renderBasic(_rowCnt, _colCnt, _showNumbers) {
+ rowCnt = _rowCnt;
+ colCnt = _colCnt;
+ showNumbers = _showNumbers;
updateOptions();
- var firstTime = !body;
- if (firstTime) {
- buildSkeleton(maxr, showNumbers);
- }else{
- clearEvents();
+
+ if (!body) {
+ buildEventContainer();
}
- updateCells(firstTime);
+
+ buildTable();
}
-
function updateOptions() {
- rtl = opt('isRTL');
- if (rtl) {
- dis = -1;
- dit = colCnt - 1;
- }else{
- dis = 1;
- dit = 0;
- }
- firstDay = opt('firstDay');
- nwe = opt('weekends') ? 0 : 1;
tm = opt('theme') ? 'ui' : 'fc';
colFormat = opt('columnFormat');
+
+ // week # options. (TODO: bad, logic also in other views)
+ showWeekNumbers = opt('weekNumbers');
+ weekNumberTitle = opt('weekNumberTitle');
+ if (opt('weekNumberCalculation') != 'iso') {
+ weekNumberFormat = "w";
+ }
+ else {
+ weekNumberFormat = "W";
+ }
}
+ function buildEventContainer() {
+ daySegmentContainer =
+ $("<div class='fc-event-container' style='position:absolute;z-index:8;top:0;left:0'/>")
+ .appendTo(element);
+ }
- function buildSkeleton(maxRowCnt, showNumbers) {
- var s;
- var headerClass = tm + "-widget-header";
- var contentClass = tm + "-widget-content";
- var i, j;
- var table;
-
- s =
- "<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
- "<thead>" +
- "<tr>";
- for (i=0; i<colCnt; i++) {
- s +=
- "<th class='fc- " + headerClass + "'/>"; // need fc- for setDayID
- }
- s +=
- "</tr>" +
- "</thead>" +
- "<tbody>";
- for (i=0; i<maxRowCnt; i++) {
- s +=
- "<tr class='fc-week" + i + "'>";
- for (j=0; j<colCnt; j++) {
- s +=
- "<td class='fc- " + contentClass + " fc-day" + (i*colCnt+j) + "'>" + // need fc- for setDayID
- "<div>" +
- (showNumbers ?
- "<div class='fc-day-number'/>" :
- ''
- ) +
- "<div class='fc-day-content'>" +
- "<div style='position:relative'> </div>" +
- "</div>" +
- "</div>" +
- "</td>";
- }
- s +=
- "</tr>";
+
+ function buildTable() {
+ var html = buildTableHTML();
+
+ if (table) {
+ table.remove();
}
- s +=
- "</tbody>" +
- "</table>";
- table = $(s).appendTo(element);
-
+ table = $(html).appendTo(element);
+
head = table.find('thead');
- headCells = head.find('th');
+ headCells = head.find('.fc-day-header');
body = table.find('tbody');
bodyRows = body.find('tr');
- bodyCells = body.find('td');
- bodyFirstCells = bodyCells.filter(':first-child');
- bodyCellTopInners = bodyRows.eq(0).find('div.fc-day-content div');
+ bodyCells = body.find('.fc-day');
+ bodyFirstCells = bodyRows.find('td:first-child');
+
+ firstRowCellInners = bodyRows.eq(0).find('.fc-day > div');
+ firstRowCellContentInners = bodyRows.eq(0).find('.fc-day-content > div');
markFirstLast(head.add(head.find('tr'))); // marks first+last tr/th's
markFirstLast(bodyRows); // marks first+last td's
- bodyRows.eq(0).addClass('fc-first'); // fc-last is done in updateCells
-
+ bodyRows.eq(0).addClass('fc-first');
+ bodyRows.filter(':last').addClass('fc-last');
+
+ bodyCells.each(function(i, _cell) {
+ var date = cellToDate(
+ Math.floor(i / colCnt),
+ i % colCnt
+ );
+ trigger('dayRender', t, date, $(_cell));
+ });
+
dayBind(bodyCells);
-
- daySegmentContainer =
- $("<div style='position:absolute;z-index:8;top:0;left:0'/>")
- .appendTo(element);
}
-
-
-
- function updateCells(firstTime) {
- var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
- var month = t.start.getMonth();
- var today = clearTime(new Date());
- var cell;
+
+
+
+ /* HTML Building
+ -----------------------------------------------------------*/
+
+
+ function buildTableHTML() {
+ var html =
+ "<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
+ buildHeadHTML() +
+ buildBodyHTML() +
+ "</table>";
+
+ return html;
+ }
+
+
+ function buildHeadHTML() {
+ var headerClass = tm + "-widget-header";
+ var html = '';
+ var col;
var date;
- var row;
-
- if (dowDirty) {
- headCells.each(function(i, _cell) {
- cell = $(_cell);
- date = indexDate(i);
- cell.html(formatDate(date, colFormat));
- setDayID(cell, date);
- });
+
+ html += "<thead><tr>";
+
+ if (showWeekNumbers) {
+ html +=
+ "<th class='fc-week-number " + headerClass + "'>" +
+ htmlEscape(weekNumberTitle) +
+ "</th>";
}
-
- bodyCells.each(function(i, _cell) {
- cell = $(_cell);
- date = indexDate(i);
- if (date.getMonth() == month) {
- cell.removeClass('fc-other-month');
- }else{
- cell.addClass('fc-other-month');
- }
- if (+date == +today) {
- cell.addClass(tm + '-state-highlight fc-today');
- }else{
- cell.removeClass(tm + '-state-highlight fc-today');
- }
- cell.find('div.fc-day-number').text(date.getDate());
- if (dowDirty) {
- setDayID(cell, date);
+
+ for (col=0; col<colCnt; col++) {
+ date = cellToDate(0, col);
+ html +=
+ "<th class='fc-day-header fc-" + dayIDs[date.getDay()] + " " + headerClass + "'>" +
+ htmlEscape(formatDate(date, colFormat)) +
+ "</th>";
+ }
+
+ html += "</tr></thead>";
+
+ return html;
+ }
+
+
+ function buildBodyHTML() {
+ var contentClass = tm + "-widget-content";
+ var html = '';
+ var row;
+ var col;
+ var date;
+
+ html += "<tbody>";
+
+ for (row=0; row<rowCnt; row++) {
+
+ html += "<tr class='fc-week'>";
+
+ if (showWeekNumbers) {
+ date = cellToDate(row, 0);
+ html +=
+ "<td class='fc-week-number " + contentClass + "'>" +
+ "<div>" +
+ htmlEscape(formatDate(date, weekNumberFormat)) +
+ "</div>" +
+ "</td>";
}
- });
-
- bodyRows.each(function(i, _row) {
- row = $(_row);
- if (i < rowCnt) {
- row.show();
- if (i == rowCnt-1) {
- row.addClass('fc-last');
- }else{
- row.removeClass('fc-last');
- }
- }else{
- row.hide();
+
+ for (col=0; col<colCnt; col++) {
+ date = cellToDate(row, col);
+ html += buildCellHTML(date);
}
- });
+
+ html += "</tr>";
+ }
+
+ html += "</tbody>";
+
+ return html;
}
-
+
+
+ function buildCellHTML(date) {
+ var contentClass = tm + "-widget-content";
+ var month = t.start.getMonth();
+ var today = clearTime(new Date());
+ var html = '';
+ var classNames = [
+ 'fc-day',
+ 'fc-' + dayIDs[date.getDay()],
+ contentClass
+ ];
+
+ if (date.getMonth() != month) {
+ classNames.push('fc-other-month');
+ }
+ if (+date == +today) {
+ classNames.push(
+ 'fc-today',
+ tm + '-state-highlight'
+ );
+ }
+ else if (date < today) {
+ classNames.push('fc-past');
+ }
+ else {
+ classNames.push('fc-future');
+ }
+
+ html +=
+ "<td" +
+ " class='" + classNames.join(' ') + "'" +
+ " data-date='" + formatDate(date, 'yyyy-MM-dd') + "'" +
+ ">" +
+ "<div>";
+
+ if (showNumbers) {
+ html += "<div class='fc-day-number'>" + date.getDate() + "</div>";
+ }
+
+ html +=
+ "<div class='fc-day-content'>" +
+ "<div style='position:relative'> </div>" +
+ "</div>" +
+ "</div>" +
+ "</td>";
+
+ return html;
+ }
+
+
+
+ /* Dimensions
+ -----------------------------------------------------------*/
function setHeight(height) {
@@ -2419,8 +2475,8 @@ function BasicView(element, calendar, viewName) {
bodyFirstCells.each(function(i, _cell) {
if (i < rowCnt) {
cell = $(_cell);
- setMinHeight(
- cell.find('> div'),
+ cell.find('> div').css(
+ 'min-height',
(i==rowCnt-1 ? rowHeightLast : rowHeight) - vsides(cell)
);
}
@@ -2431,8 +2487,15 @@ function BasicView(element, calendar, viewName) {
function setWidth(width) {
viewWidth = width;
+ colPositions.clear();
colContentPositions.clear();
- colWidth = Math.floor(viewWidth / colCnt);
+
+ weekNumberWidth = 0;
+ if (showWeekNumbers) {
+ weekNumberWidth = head.find('th.fc-week-number').outerWidth();
+ }
+
+ colWidth = Math.floor((viewWidth - weekNumberWidth) / colCnt);
setOuterWidth(headCells.slice(0, -1), colWidth);
}
@@ -2450,8 +2513,7 @@ function BasicView(element, calendar, viewName) {
function dayClick(ev) {
if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
- var index = parseInt(this.className.match(/fc\-day(\d+)/)[1]); // TODO: maybe use .data
- var date = indexDate(index);
+ var date = parseISO8601($(this).data('date'));
trigger('dayClick', this, date, true, ev);
}
}
@@ -2460,35 +2522,30 @@ function BasicView(element, calendar, viewName) {
/* Semi-transparent Overlay Helpers
------------------------------------------------------*/
-
-
+ // TODO: should be consolidated with AgendaView's methods
+
+
function renderDayOverlay(overlayStart, overlayEnd, refreshCoordinateGrid) { // overlayEnd is exclusive
+
if (refreshCoordinateGrid) {
coordinateGrid.build();
}
- var rowStart = cloneDate(t.visStart);
- var rowEnd = addDays(cloneDate(rowStart), colCnt);
- for (var i=0; i<rowCnt; i++) {
- var stretchStart = new Date(Math.max(rowStart, overlayStart));
- var stretchEnd = new Date(Math.min(rowEnd, overlayEnd));
- if (stretchStart < stretchEnd) {
- var colStart, colEnd;
- if (rtl) {
- colStart = dayDiff(stretchEnd, rowStart)*dis+dit+1;
- colEnd = dayDiff(stretchStart, rowStart)*dis+dit+1;
- }else{
- colStart = dayDiff(stretchStart, rowStart);
- colEnd = dayDiff(stretchEnd, rowStart);
- }
- dayBind(
- renderCellOverlay(i, colStart, i, colEnd-1)
- );
- }
- addDays(rowStart, 7);
- addDays(rowEnd, 7);
+
+ var segments = rangeToSegments(overlayStart, overlayEnd);
+
+ for (var i=0; i<segments.length; i++) {
+ var segment = segments[i];
+ dayBind(
+ renderCellOverlay(
+ segment.row,
+ segment.leftCol,
+ segment.row,
+ segment.rightCol
+ )
+ );
}
}
-
+
function renderCellOverlay(row0, col0, row1, col1) { // row1,col1 is inclusive
var rect = coordinateGrid.rect(row0, col0, row1, col1, element);
@@ -2517,7 +2574,7 @@ function BasicView(element, calendar, viewName) {
function reportDayClick(date, allDay, ev) {
- var cell = dateCell(date);
+ var cell = dateToCell(date);
var _element = bodyCells[cell.row*colCnt + cell.col];
trigger('dayClick', _element, date, allDay, ev);
}
@@ -2542,7 +2599,7 @@ function BasicView(element, calendar, viewName) {
var cell = hoverListener.stop();
clearOverlays();
if (cell) {
- var d = cellDate(cell);
+ var d = cellToDate(cell);
trigger('drop', _dragElement, d, true, ev, ui);
}
}
@@ -2587,10 +2644,23 @@ function BasicView(element, calendar, viewName) {
hoverListener = new HoverListener(coordinateGrid);
-
+ colPositions = new HorizontalPositionCache(function(col) {
+ return firstRowCellInners.eq(col);
+ });
+
colContentPositions = new HorizontalPositionCache(function(col) {
- return bodyCellTopInners.eq(col);
+ return firstRowCellContentInners.eq(col);
});
+
+
+ function colLeft(col) {
+ return colPositions.left(col);
+ }
+
+
+ function colRight(col) {
+ return colPositions.right(col);
+ }
function colContentLeft(col) {
@@ -2603,195 +2673,43 @@ function BasicView(element, calendar, viewName) {
}
-
-
- function dateCell(date) {
- return {
- row: Math.floor(dayDiff(date, t.visStart) / 7),
- col: dayOfWeekCol(date.getDay())
- };
- }
-
-
- function cellDate(cell) {
- return _cellDate(cell.row, cell.col);
- }
-
-
- function _cellDate(row, col) {
- return addDays(cloneDate(t.visStart), row*7 + col*dis+dit);
- // what about weekends in middle of week?
- }
-
-
- function indexDate(index) {
- return _cellDate(Math.floor(index/colCnt), index%colCnt);
- }
-
-
- function dayOfWeekCol(dayOfWeek) {
- return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt) * dis + dit;
- }
-
-
-
-
function allDayRow(i) {
return bodyRows.eq(i);
}
-
- function allDayBounds(i) {
- return {
- left: 0,
- right: viewWidth
- };
- }
-
-
}
+;;
+
function BasicEventRenderer() {
var t = this;
// exports
t.renderEvents = renderEvents;
- t.compileDaySegs = compileSegs; // for DayEventRenderer
t.clearEvents = clearEvents;
- t.bindDaySeg = bindDaySeg;
-
+
// imports
DayEventRenderer.call(t);
- var opt = t.opt;
- var trigger = t.trigger;
- //var setOverflowHidden = t.setOverflowHidden;
- var isEventDraggable = t.isEventDraggable;
- var isEventResizable = t.isEventResizable;
- var reportEvents = t.reportEvents;
- var reportEventClear = t.reportEventClear;
- var eventElementHandlers = t.eventElementHandlers;
- var showEvents = t.showEvents;
- var hideEvents = t.hideEvents;
- var eventDrop = t.eventDrop;
- var getDaySegmentContainer = t.getDaySegmentContainer;
- var getHoverListener = t.getHoverListener;
- var renderDayOverlay = t.renderDayOverlay;
- var clearOverlays = t.clearOverlays;
- var getRowCnt = t.getRowCnt;
- var getColCnt = t.getColCnt;
- var renderDaySegs = t.renderDaySegs;
- var resizableDayEvent = t.resizableDayEvent;
-
-
-
- /* Rendering
- --------------------------------------------------------------------*/
-
+
function renderEvents(events, modifiedEventId) {
- reportEvents(events);
- renderDaySegs(compileSegs(events), modifiedEventId);
+ t.renderDayEvents(events, modifiedEventId);
}
function clearEvents() {
- reportEventClear();
- getDaySegmentContainer().empty();
- }
-
-
- function compileSegs(events) {
- var rowCnt = getRowCnt(),
- colCnt = getColCnt(),
- d1 = cloneDate(t.visStart),
- d2 = addDays(cloneDate(d1), colCnt),
- visEventsEnds = $.map(events, exclEndDay),
- i, row,
- j, level,
- k, seg,
- segs=[];
- for (i=0; i<rowCnt; i++) {
- row = stackSegs(sliceSegs(events, visEventsEnds, d1, d2));
- for (j=0; j<row.length; j++) {
- level = row[j];
- for (k=0; k<level.length; k++) {
- seg = level[k];
- seg.row = i;
- seg.level = j; // not needed anymore
- segs.push(seg);
- }
- }
- addDays(d1, 7);
- addDays(d2, 7);
- }
- return segs;
- }
-
-
- function bindDaySeg(event, eventElement, seg) {
- if (isEventDraggable(event)) {
- draggableDayEvent(event, eventElement);
- }
- if (seg.isEnd && isEventResizable(event)) {
- resizableDayEvent(event, eventElement, seg);
- }
- eventElementHandlers(event, eventElement);
- // needs to be after, because resizableDayEvent might stopImmediatePropagation on click
- }
-
-
-
- /* Dragging
- ----------------------------------------------------------------------------*/
-
-
- function draggableDayEvent(event, eventElement) {
- var hoverListener = getHoverListener();
- var dayDelta;
- eventElement.draggable({
- zIndex: 9,
- delay: 50,
- opacity: opt('dragOpacity'),
- revertDuration: opt('dragRevertDuration'),
- start: function(ev, ui) {
- trigger('eventDragStart', eventElement, event, ev, ui);
- hideEvents(event, eventElement);
- hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
- eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
- clearOverlays();
- if (cell) {
- //setOverflowHidden(true);
- dayDelta = rowDelta*7 + colDelta * (opt('isRTL') ? -1 : 1);
- renderDayOverlay(
- addDays(cloneDate(event.start), dayDelta),
- addDays(exclEndDay(event), dayDelta)
- );
- }else{
- //setOverflowHidden(false);
- dayDelta = 0;
- }
- }, ev, 'drag');
- },
- stop: function(ev, ui) {
- hoverListener.stop();
- clearOverlays();
- trigger('eventDragStop', eventElement, event, ev, ui);
- if (dayDelta) {
- eventDrop(this, event, dayDelta, 0, event.allDay, ev, ui);
- }else{
- eventElement.css('filter', ''); // clear IE opacity side-effects
- showEvents(event, eventElement);
- }
- //setOverflowHidden(false);
- }
- });
+ t.getDaySegmentContainer().empty();
}
+ // TODO: have this class (and AgendaEventRenderer) be responsible for creating the event container div
+
}
+;;
+
fcViews.agendaWeek = AgendaWeekView;
function AgendaWeekView(element, calendar) {
@@ -2806,40 +2724,49 @@ function AgendaWeekView(element, calendar) {
AgendaView.call(t, element, calendar, 'agendaWeek');
var opt = t.opt;
var renderAgenda = t.renderAgenda;
+ var skipHiddenDays = t.skipHiddenDays;
+ var getCellsPerWeek = t.getCellsPerWeek;
var formatDates = calendar.formatDates;
-
-
+
function render(date, delta) {
+
if (delta) {
addDays(date, delta * 7);
}
+
var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
var end = addDays(cloneDate(start), 7);
+
var visStart = cloneDate(start);
+ skipHiddenDays(visStart);
+
var visEnd = cloneDate(end);
- var weekends = opt('weekends');
- if (!weekends) {
- skipWeekend(visStart);
- skipWeekend(visEnd, -1, true);
- }
+ skipHiddenDays(visEnd, -1, true);
+
+ var colCnt = getCellsPerWeek();
+
t.title = formatDates(
visStart,
addDays(cloneDate(visEnd), -1),
opt('titleFormat')
);
+
t.start = start;
t.end = end;
t.visStart = visStart;
t.visEnd = visEnd;
- renderAgenda(weekends ? 7 : 5);
+
+ renderAgenda(colCnt);
}
-
}
+;;
+
fcViews.agendaDay = AgendaDayView;
+
function AgendaDayView(element, calendar) {
var t = this;
@@ -2852,28 +2779,33 @@ function AgendaDayView(element, calendar) {
AgendaView.call(t, element, calendar, 'agendaDay');
var opt = t.opt;
var renderAgenda = t.renderAgenda;
+ var skipHiddenDays = t.skipHiddenDays;
var formatDate = calendar.formatDate;
-
function render(date, delta) {
+
if (delta) {
addDays(date, delta);
- if (!opt('weekends')) {
- skipWeekend(date, delta < 0 ? -1 : 1);
- }
}
+ skipHiddenDays(date, delta < 0 ? -1 : 1);
+
var start = cloneDate(date, true);
var end = addDays(cloneDate(start), 1);
+
t.title = formatDate(date, opt('titleFormat'));
+
t.start = t.visStart = start;
t.end = t.visEnd = end;
+
renderAgenda(1);
}
}
+;;
+
setDefaults({
allDaySlot: true,
allDayText: 'all-day',
@@ -2888,7 +2820,8 @@ setDefaults({
agenda: .5
},
minTime: 0,
- maxTime: 24
+ maxTime: 24,
+ slotEventOverlap: true
});
@@ -2904,28 +2837,27 @@ function AgendaView(element, calendar, viewName) {
t.renderAgenda = renderAgenda;
t.setWidth = setWidth;
t.setHeight = setHeight;
- t.beforeHide = beforeHide;
- t.afterShow = afterShow;
+ t.afterRender = afterRender;
t.defaultEventEnd = defaultEventEnd;
t.timePosition = timePosition;
- t.dayOfWeekCol = dayOfWeekCol;
- t.dateCell = dateCell;
- t.cellDate = cellDate;
- t.cellIsAllDay = cellIsAllDay;
+ t.getIsCellAllDay = getIsCellAllDay;
t.allDayRow = getAllDayRow;
- t.allDayBounds = allDayBounds;
+ t.getCoordinateGrid = function() { return coordinateGrid }; // specifically for AgendaEventRenderer
t.getHoverListener = function() { return hoverListener };
+ t.colLeft = colLeft;
+ t.colRight = colRight;
t.colContentLeft = colContentLeft;
t.colContentRight = colContentRight;
t.getDaySegmentContainer = function() { return daySegmentContainer };
t.getSlotSegmentContainer = function() { return slotSegmentContainer };
t.getMinMinute = function() { return minMinute };
t.getMaxMinute = function() { return maxMinute };
- t.getBodyContent = function() { return slotContent }; // !!??
+ t.getSlotContainer = function() { return slotContainer };
t.getRowCnt = function() { return 1 };
t.getColCnt = function() { return colCnt };
t.getColWidth = function() { return colWidth };
- t.getSlotHeight = function() { return slotHeight };
+ t.getSnapHeight = function() { return snapHeight };
+ t.getSnapMinutes = function() { return snapMinutes };
t.defaultSelectionEnd = defaultSelectionEnd;
t.renderDayOverlay = renderDayOverlay;
t.renderSelection = renderSelection;
@@ -2942,13 +2874,15 @@ function AgendaView(element, calendar, viewName) {
AgendaEventRenderer.call(t);
var opt = t.opt;
var trigger = t.trigger;
- var clearEvents = t.clearEvents;
var renderOverlay = t.renderOverlay;
var clearOverlays = t.clearOverlays;
var reportSelection = t.reportSelection;
var unselect = t.unselect;
var daySelectionMousedown = t.daySelectionMousedown;
var slotSegHtml = t.slotSegHtml;
+ var cellToDate = t.cellToDate;
+ var dateToCell = t.dateToCell;
+ var rangeToSegments = t.rangeToSegments;
var formatDate = calendar.formatDate;
@@ -2960,6 +2894,7 @@ function AgendaView(element, calendar, viewName) {
var dayBody;
var dayBodyCells;
var dayBodyCellInners;
+ var dayBodyCellContentInners;
var dayBodyFirstCell;
var dayBodyFirstCellStretcher;
var slotLayer;
@@ -2967,12 +2902,9 @@ function AgendaView(element, calendar, viewName) {
var allDayTable;
var allDayRow;
var slotScroller;
- var slotContent;
+ var slotContainer;
var slotSegmentContainer;
var slotTable;
- var slotTableFirstInner;
- var axisFirstCells;
- var gutterCells;
var selectionHelper;
var viewWidth;
@@ -2981,21 +2913,26 @@ function AgendaView(element, calendar, viewName) {
var colWidth;
var gutterWidth;
var slotHeight; // TODO: what if slotHeight changes? (see issue 650)
- var savedScrollTop;
+
+ var snapMinutes;
+ var snapRatio; // ratio of number of "selection" slots to normal slots. (ex: 1, 2, 4)
+ var snapHeight; // holds the pixel hight of a "selection" slot
var colCnt;
var slotCnt;
var coordinateGrid;
var hoverListener;
+ var colPositions;
var colContentPositions;
var slotTopCache = {};
var tm;
- var firstDay;
- var nwe; // no weekends (int)
- var rtl, dis, dit; // day index sign / translate
+ var rtl;
var minMinute, maxMinute;
var colFormat;
+ var showWeekNumbers;
+ var weekNumberTitle;
+ var weekNumberFormat;
@@ -3009,89 +2946,54 @@ function AgendaView(element, calendar, viewName) {
function renderAgenda(c) {
colCnt = c;
updateOptions();
- if (!dayTable) {
- buildSkeleton();
- }else{
- clearEvents();
+
+ if (!dayTable) { // first time rendering?
+ buildSkeleton(); // builds day table, slot area, events containers
+ }
+ else {
+ buildDayTable(); // rebuilds day table
}
- updateCells();
}
-
function updateOptions() {
+
tm = opt('theme') ? 'ui' : 'fc';
- nwe = opt('weekends') ? 0 : 1;
- firstDay = opt('firstDay');
- if (rtl = opt('isRTL')) {
- dis = -1;
- dit = colCnt - 1;
- }else{
- dis = 1;
- dit = 0;
- }
+ rtl = opt('isRTL')
minMinute = parseTime(opt('minTime'));
maxMinute = parseTime(opt('maxTime'));
colFormat = opt('columnFormat');
+
+ // week # options. (TODO: bad, logic also in other views)
+ showWeekNumbers = opt('weekNumbers');
+ weekNumberTitle = opt('weekNumberTitle');
+ if (opt('weekNumberCalculation') != 'iso') {
+ weekNumberFormat = "w";
+ }
+ else {
+ weekNumberFormat = "W";
+ }
+
+ snapMinutes = opt('snapMinutes') || opt('slotMinutes');
}
-
-
-
+
+
+
+ /* Build DOM
+ -----------------------------------------------------------------------*/
+
+
function buildSkeleton() {
var headerClass = tm + "-widget-header";
var contentClass = tm + "-widget-content";
var s;
- var i;
var d;
+ var i;
var maxd;
var minutes;
var slotNormal = opt('slotMinutes') % 15 == 0;
- s =
- "<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'>" +
- "<thead>" +
- "<tr>" +
- "<th class='fc-agenda-axis " + headerClass + "'> </th>";
- for (i=0; i<colCnt; i++) {
- s +=
- "<th class='fc- fc-col" + i + ' ' + headerClass + "'/>"; // fc- needed for setDayID
- }
- s +=
- "<th class='fc-agenda-gutter " + headerClass + "'> </th>" +
- "</tr>" +
- "</thead>" +
- "<tbody>" +
- "<tr>" +
- "<th class='fc-agenda-axis " + headerClass + "'> </th>";
- for (i=0; i<colCnt; i++) {
- s +=
- "<td class='fc- fc-col" + i + ' ' + contentClass + "'>" + // fc- needed for setDayID
- "<div>" +
- "<div class='fc-day-content'>" +
- "<div style='position:relative'> </div>" +
- "</div>" +
- "</div>" +
- "</td>";
- }
- s +=
- "<td class='fc-agenda-gutter " + contentClass + "'> </td>" +
- "</tr>" +
- "</tbody>" +
- "</table>";
- dayTable = $(s).appendTo(element);
- dayHead = dayTable.find('thead');
- dayHeadCells = dayHead.find('th').slice(1, -1);
- dayBody = dayTable.find('tbody');
- dayBodyCells = dayBody.find('td').slice(0, -1);
- dayBodyCellInners = dayBodyCells.find('div.fc-day-content div');
- dayBodyFirstCell = dayBodyCells.eq(0);
- dayBodyFirstCellStretcher = dayBodyFirstCell.find('> div');
-
- markFirstLast(dayHead.add(dayHead.find('tr')));
- markFirstLast(dayBody.add(dayBody.find('tr')));
-
- axisFirstCells = dayHead.find('th:first');
- gutterCells = dayTable.find('.fc-agenda-gutter');
+ buildDayTable();
slotLayer =
$("<div style='position:absolute;z-index:2;left:0;width:100%'/>")
@@ -3100,7 +3002,7 @@ function AgendaView(element, calendar, viewName) {
if (opt('allDaySlot')) {
daySegmentContainer =
- $("<div style='position:absolute;z-index:8;top:0;left:0'/>")
+ $("<div class='fc-event-container' style='position:absolute;z-index:8;top:0;left:0'/>")
.appendTo(slotLayer);
s =
@@ -3118,9 +3020,6 @@ function AgendaView(element, calendar, viewName) {
dayBind(allDayRow.find('td'));
- axisFirstCells = axisFirstCells.add(allDayTable.find('th:first'));
- gutterCells = gutterCells.add(allDayTable.find('th.fc-agenda-gutter'));
-
slotLayer.append(
"<div class='fc-agenda-divider " + headerClass + "'>" +
"<div class='fc-agenda-divider-inner'/>" +
@@ -3137,13 +3036,13 @@ function AgendaView(element, calendar, viewName) {
$("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>")
.appendTo(slotLayer);
- slotContent =
+ slotContainer =
$("<div style='position:relative;width:100%;overflow:hidden'/>")
.appendTo(slotScroller);
slotSegmentContainer =
- $("<div style='position:absolute;z-index:8;top:0;left:0'/>")
- .appendTo(slotContent);
+ $("<div class='fc-event-container' style='position:absolute;z-index:8;top:0;left:0'/>")
+ .appendTo(slotContainer);
s =
"<table class='fc-agenda-slots' style='width:100%' cellspacing='0'>" +
@@ -3169,39 +3068,170 @@ function AgendaView(element, calendar, viewName) {
s +=
"</tbody>" +
"</table>";
- slotTable = $(s).appendTo(slotContent);
- slotTableFirstInner = slotTable.find('div:first');
+ slotTable = $(s).appendTo(slotContainer);
slotBind(slotTable.find('td'));
+ }
+
+
+
+ /* Build Day Table
+ -----------------------------------------------------------------------*/
+
+
+ function buildDayTable() {
+ var html = buildDayTableHTML();
+
+ if (dayTable) {
+ dayTable.remove();
+ }
+ dayTable = $(html).appendTo(element);
+
+ dayHead = dayTable.find('thead');
+ dayHeadCells = dayHead.find('th').slice(1, -1); // exclude gutter
+ dayBody = dayTable.find('tbody');
+ dayBodyCells = dayBody.find('td').slice(0, -1); // exclude gutter
+ dayBodyCellInners = dayBodyCells.find('> div');
+ dayBodyCellContentInners = dayBodyCells.find('.fc-day-content > div');
+
+ dayBodyFirstCell = dayBodyCells.eq(0);
+ dayBodyFirstCellStretcher = dayBodyCellInners.eq(0);
- axisFirstCells = axisFirstCells.add(slotTable.find('th:first'));
+ markFirstLast(dayHead.add(dayHead.find('tr')));
+ markFirstLast(dayBody.add(dayBody.find('tr')));
+
+ // TODO: now that we rebuild the cells every time, we should call dayRender
}
-
-
-
- function updateCells() {
- var i;
- var headCell;
- var bodyCell;
+
+
+ function buildDayTableHTML() {
+ var html =
+ "<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'>" +
+ buildDayTableHeadHTML() +
+ buildDayTableBodyHTML() +
+ "</table>";
+
+ return html;
+ }
+
+
+ function buildDayTableHeadHTML() {
+ var headerClass = tm + "-widget-header";
+ var date;
+ var html = '';
+ var weekText;
+ var col;
+
+ html +=
+ "<thead>" +
+ "<tr>";
+
+ if (showWeekNumbers) {
+ date = cellToDate(0, 0);
+ weekText = formatDate(date, weekNumberFormat);
+ if (rtl) {
+ weekText += weekNumberTitle;
+ }
+ else {
+ weekText = weekNumberTitle + weekText;
+ }
+ html +=
+ "<th class='fc-agenda-axis fc-week-number " + headerClass + "'>" +
+ htmlEscape(weekText) +
+ "</th>";
+ }
+ else {
+ html += "<th class='fc-agenda-axis " + headerClass + "'> </th>";
+ }
+
+ for (col=0; col<colCnt; col++) {
+ date = cellToDate(0, col);
+ html +=
+ "<th class='fc-" + dayIDs[date.getDay()] + " fc-col" + col + ' ' + headerClass + "'>" +
+ htmlEscape(formatDate(date, colFormat)) +
+ "</th>";
+ }
+
+ html +=
+ "<th class='fc-agenda-gutter " + headerClass + "'> </th>" +
+ "</tr>" +
+ "</thead>";
+
+ return html;
+ }
+
+
+ function buildDayTableBodyHTML() {
+ var headerClass = tm + "-widget-header"; // TODO: make these when updateOptions() called
+ var contentClass = tm + "-widget-content";
var date;
var today = clearTime(new Date());
- for (i=0; i<colCnt; i++) {
- date = colDate(i);
- headCell = dayHeadCells.eq(i);
- headCell.html(formatDate(date, colFormat));
- bodyCell = dayBodyCells.eq(i);
+ var col;
+ var cellsHTML;
+ var cellHTML;
+ var classNames;
+ var html = '';
+
+ html +=
+ "<tbody>" +
+ "<tr>" +
+ "<th class='fc-agenda-axis " + headerClass + "'> </th>";
+
+ cellsHTML = '';
+
+ for (col=0; col<colCnt; col++) {
+
+ date = cellToDate(0, col);
+
+ classNames = [
+ 'fc-col' + col,
+ 'fc-' + dayIDs[date.getDay()],
+ contentClass
+ ];
if (+date == +today) {
- bodyCell.addClass(tm + '-state-highlight fc-today');
- }else{
- bodyCell.removeClass(tm + '-state-highlight fc-today');
+ classNames.push(
+ tm + '-state-highlight',
+ 'fc-today'
+ );
+ }
+ else if (date < today) {
+ classNames.push('fc-past');
}
- setDayID(headCell.add(bodyCell), date);
+ else {
+ classNames.push('fc-future');
+ }
+
+ cellHTML =
+ "<td class='" + classNames.join(' ') + "'>" +
+ "<div>" +
+ "<div class='fc-day-content'>" +
+ "<div style='position:relative'> </div>" +
+ "</div>" +
+ "</div>" +
+ "</td>";
+
+ cellsHTML += cellHTML;
}
+
+ html += cellsHTML;
+ html +=
+ "<td class='fc-agenda-gutter " + contentClass + "'> </td>" +
+ "</tr>" +
+ "</tbody>";
+
+ return html;
}
+
+
+ // TODO: data-date on the cells
+
+ /* Dimensions
+ -----------------------------------------------------------------------*/
+
- function setHeight(height, dateChanged) {
+ function setHeight(height) {
if (height === undefined) {
height = viewHeight;
}
@@ -3214,7 +3244,7 @@ function AgendaView(element, calendar, viewName) {
height - headHeight, // when scrollbars
slotTable.height() + allDayHeight + 1 // when no scrollbars. +1 for bottom border
);
-
+
dayBodyFirstCellStretcher
.height(bodyHeight - vsides(dayBodyFirstCell));
@@ -3222,18 +3252,25 @@ function AgendaView(element, calendar, viewName) {
slotScroller.height(bodyHeight - allDayHeight - 1);
- slotHeight = slotTableFirstInner.height() + 1; // +1 for border
-
- if (dateChanged) {
- resetScroll();
- }
+ // the stylesheet guarantees that the first row has no border.
+ // this allows .height() to work well cross-browser.
+ slotHeight = slotTable.find('tr:first').height() + 1; // +1 for bottom border
+
+ snapRatio = opt('slotMinutes') / snapMinutes;
+ snapHeight = slotHeight / snapRatio;
}
-
function setWidth(width) {
viewWidth = width;
+ colPositions.clear();
colContentPositions.clear();
+
+ var axisFirstCells = dayHead.find('th:first');
+ if (allDayTable) {
+ axisFirstCells = axisFirstCells.add(allDayTable.find('th:first'));
+ }
+ axisFirstCells = axisFirstCells.add(slotTable.find('th:first'));
axisWidth = 0;
setOuterWidth(
@@ -3245,8 +3282,12 @@ function AgendaView(element, calendar, viewName) {
axisWidth
);
+ var gutterCells = dayTable.find('.fc-agenda-gutter');
+ if (allDayTable) {
+ gutterCells = gutterCells.add(allDayTable.find('th.fc-agenda-gutter'));
+ }
+
var slotTableWidth = slotScroller[0].clientWidth; // needs to be done after axisWidth (for IE7)
- //slotTable.width(slotTableWidth);
gutterWidth = slotScroller.width() - slotTableWidth;
if (gutterWidth) {
@@ -3268,6 +3309,10 @@ function AgendaView(element, calendar, viewName) {
+ /* Scrolling
+ -----------------------------------------------------------------------*/
+
+
function resetScroll() {
var d0 = zeroDate();
var scrollDate = cloneDate(d0);
@@ -3279,15 +3324,10 @@ function AgendaView(element, calendar, viewName) {
scroll();
setTimeout(scroll, 0); // overrides any previous scroll state made by the browser
}
-
-
- function beforeHide() {
- savedScrollTop = slotScroller.scrollTop();
- }
-
-
- function afterShow() {
- slotScroller.scrollTop(savedScrollTop);
+
+
+ function afterRender() { // after the view has been freshly rendered and sized
+ resetScroll();
}
@@ -3311,7 +3351,7 @@ function AgendaView(element, calendar, viewName) {
function slotClick(ev) {
if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
var col = Math.min(colCnt-1, Math.floor((ev.pageX - dayTable.offset().left - axisWidth) / colWidth));
- var date = colDate(col);
+ var date = cellToDate(0, col);
var rowMatch = this.parentNode.className.match(/fc-slot(\d+)/); // TODO: maybe use data
if (rowMatch) {
var mins = parseInt(rowMatch[1]) * opt('slotMinutes');
@@ -3329,26 +3369,26 @@ function AgendaView(element, calendar, viewName) {
/* Semi-transparent Overlay Helpers
-----------------------------------------------------*/
-
+ // TODO: should be consolidated with BasicView's methods
+
+
+ function renderDayOverlay(overlayStart, overlayEnd, refreshCoordinateGrid) { // overlayEnd is exclusive
- function renderDayOverlay(startDate, endDate, refreshCoordinateGrid) { // endDate is exclusive
if (refreshCoordinateGrid) {
coordinateGrid.build();
}
- var visStart = cloneDate(t.visStart);
- var startCol, endCol;
- if (rtl) {
- startCol = dayDiff(endDate, visStart)*dis+dit+1;
- endCol = dayDiff(startDate, visStart)*dis+dit+1;
- }else{
- startCol = dayDiff(startDate, visStart);
- endCol = dayDiff(endDate, visStart);
- }
- startCol = Math.max(0, startCol);
- endCol = Math.min(colCnt, endCol);
- if (startCol < endCol) {
+
+ var segments = rangeToSegments(overlayStart, overlayEnd);
+
+ for (var i=0; i<segments.length; i++) {
+ var segment = segments[i];
dayBind(
- renderCellOverlay(0, startCol, 0, endCol-1)
+ renderCellOverlay(
+ segment.row,
+ segment.leftCol,
+ segment.row,
+ segment.rightCol
+ )
);
}
}
@@ -3361,24 +3401,21 @@ function AgendaView(element, calendar, viewName) {
function renderSlotOverlay(overlayStart, overlayEnd) {
- var dayStart = cloneDate(t.visStart);
- var dayEnd = addDays(cloneDate(dayStart), 1);
for (var i=0; i<colCnt; i++) {
+ var dayStart = cellToDate(0, i);
+ var dayEnd = addDays(cloneDate(dayStart), 1);
var stretchStart = new Date(Math.max(dayStart, overlayStart));
var stretchEnd = new Date(Math.min(dayEnd, overlayEnd));
if (stretchStart < stretchEnd) {
- var col = i*dis+dit;
- var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only use it for horizontal coords
+ var rect = coordinateGrid.rect(0, i, 0, i, slotContainer); // only use it for horizontal coords
var top = timePosition(dayStart, stretchStart);
var bottom = timePosition(dayStart, stretchEnd);
rect.top = top;
rect.height = bottom - top;
slotBind(
- renderOverlay(rect, slotContent)
+ renderOverlay(rect, slotContainer)
);
}
- addDays(dayStart, 1);
- addDays(dayEnd, 1);
}
}
@@ -3405,16 +3442,16 @@ function AgendaView(element, calendar, viewName) {
n = e.offset().top;
rows[0] = [n, n+e.outerHeight()];
}
- var slotTableTop = slotContent.offset().top;
+ var slotTableTop = slotContainer.offset().top;
var slotScrollerTop = slotScroller.offset().top;
var slotScrollerBottom = slotScrollerTop + slotScroller.outerHeight();
function constrain(n) {
return Math.max(slotScrollerTop, Math.min(slotScrollerBottom, n));
}
- for (var i=0; i<slotCnt; i++) {
+ for (var i=0; i<slotCnt*snapRatio; i++) { // adapt slot count to increased/decreased selection slot count
rows.push([
- constrain(slotTableTop + slotHeight*i),
- constrain(slotTableTop + slotHeight*(i+1))
+ constrain(slotTableTop + snapHeight*i),
+ constrain(slotTableTop + snapHeight*(i+1))
]);
}
});
@@ -3422,62 +3459,53 @@ function AgendaView(element, calendar, viewName) {
hoverListener = new HoverListener(coordinateGrid);
+ colPositions = new HorizontalPositionCache(function(col) {
+ return dayBodyCellInners.eq(col);
+ });
colContentPositions = new HorizontalPositionCache(function(col) {
- return dayBodyCellInners.eq(col);
+ return dayBodyCellContentInners.eq(col);
});
+ function colLeft(col) {
+ return colPositions.left(col);
+ }
+
+
function colContentLeft(col) {
return colContentPositions.left(col);
}
+
+
+ function colRight(col) {
+ return colPositions.right(col);
+ }
function colContentRight(col) {
return colContentPositions.right(col);
}
-
-
-
-
- function dateCell(date) { // "cell" terminology is now confusing
- return {
- row: Math.floor(dayDiff(date, t.visStart) / 7),
- col: dayOfWeekCol(date.getDay())
- };
+
+
+ function getIsCellAllDay(cell) {
+ return opt('allDaySlot') && !cell.row;
}
-
-
- function cellDate(cell) {
- var d = colDate(cell.col);
+
+
+ function realCellToDate(cell) { // ugh "real" ... but blame it on our abuse of the "cell" system
+ var d = cellToDate(0, cell.col);
var slotIndex = cell.row;
if (opt('allDaySlot')) {
slotIndex--;
}
if (slotIndex >= 0) {
- addMinutes(d, minMinute + slotIndex * opt('slotMinutes'));
+ addMinutes(d, minMinute + slotIndex * snapMinutes);
}
return d;
}
- function colDate(col) { // returns dates with 00:00:00
- return addDays(cloneDate(t.visStart), col*dis+dit);
- }
-
-
- function cellIsAllDay(cell) {
- return opt('allDaySlot') && !cell.row;
- }
-
-
- function dayOfWeekCol(dayOfWeek) {
- return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt)*dis+dit;
- }
-
-
-
-
// get the Y coordinate of the given time on the given day (both Date objects)
function timePosition(day, time) { // both date objects. day holds 00:00 of current day
day = cloneDate(day, true);
@@ -3492,7 +3520,11 @@ function AgendaView(element, calendar, viewName) {
slotI = Math.floor(minutes / slotMinutes),
slotTop = slotTopCache[slotI];
if (slotTop === undefined) {
- slotTop = slotTopCache[slotI] = slotTable.find('tr:eq(' + slotI + ') td div')[0].offsetTop; //.position().top; // need this optimization???
+ slotTop = slotTopCache[slotI] =
+ slotTable.find('tr').eq(slotI).find('td div')[0].offsetTop;
+ // .eq() is faster than ":eq()" selector
+ // [0].offsetTop is faster than .position().top (do we really need this optimization?)
+ // a better optimization would be to cache all these divs
}
return Math.max(0, Math.round(
slotTop - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
@@ -3500,14 +3532,6 @@ function AgendaView(element, calendar, viewName) {
}
- function allDayBounds() {
- return {
- left: axisWidth,
- right: viewWidth - gutterWidth
- }
- }
-
-
function getAllDayRow(index) {
return allDayRow;
}
@@ -3550,9 +3574,9 @@ function AgendaView(element, calendar, viewName) {
var helperOption = opt('selectHelper');
coordinateGrid.build();
if (helperOption) {
- var col = dayDiff(startDate, t.visStart) * dis + dit;
+ var col = dateToCell(startDate).col;
if (col >= 0 && col < colCnt) { // only works when times are on same day
- var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only for horizontal coords
+ var rect = coordinateGrid.rect(0, col, 0, col, slotContainer); // only for horizontal coords
var top = timePosition(startDate, startDate);
var bottom = timePosition(startDate, endDate);
if (bottom > top) { // protect against selections that are entirely before or after visible range
@@ -3564,10 +3588,9 @@ function AgendaView(element, calendar, viewName) {
var helperRes = helperOption(startDate, endDate);
if (helperRes) {
rect.position = 'absolute';
- rect.zIndex = 8;
selectionHelper = $(helperRes)
.css(rect)
- .appendTo(slotContent);
+ .appendTo(slotContainer);
}
}else{
rect.isStart = true; // conside rect a "seg" now
@@ -3586,7 +3609,7 @@ function AgendaView(element, calendar, viewName) {
}
if (selectionHelper) {
slotBind(selectionHelper);
- slotContent.append(selectionHelper);
+ slotContainer.append(selectionHelper);
setOuterWidth(selectionHelper, rect.width, true); // needs to be after appended
setOuterHeight(selectionHelper, rect.height, true);
}
@@ -3613,15 +3636,15 @@ function AgendaView(element, calendar, viewName) {
var dates, helperOption = opt('selectHelper');
hoverListener.start(function(cell, origCell) {
clearSelection();
- if (cell && (cell.col == origCell.col || !helperOption) && !cellIsAllDay(cell)) {
- var d1 = cellDate(origCell);
- var d2 = cellDate(cell);
+ if (cell && (cell.col == origCell.col || !helperOption) && !getIsCellAllDay(cell)) {
+ var d1 = realCellToDate(origCell);
+ var d2 = realCellToDate(cell);
dates = [
d1,
- addMinutes(cloneDate(d1), opt('slotMinutes')),
+ addMinutes(cloneDate(d1), snapMinutes), // calculate minutes depending on selection slot minutes
d2,
- addMinutes(cloneDate(d2), opt('slotMinutes'))
- ].sort(cmp);
+ addMinutes(cloneDate(d2), snapMinutes)
+ ].sort(dateCompare);
renderSlotSelection(dates[0], dates[3]);
}else{
dates = null;
@@ -3638,10 +3661,10 @@ function AgendaView(element, calendar, viewName) {
});
}
}
-
-
+
+
function reportDayClick(date, allDay, ev) {
- trigger('dayClick', dayBodyCells[dayOfWeekCol(date.getDay())], date, allDay, ev);
+ trigger('dayClick', dayBodyCells[dateToCell(date).col], date, allDay, ev);
}
@@ -3654,10 +3677,10 @@ function AgendaView(element, calendar, viewName) {
hoverListener.start(function(cell) {
clearOverlays();
if (cell) {
- if (cellIsAllDay(cell)) {
+ if (getIsCellAllDay(cell)) {
renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
}else{
- var d1 = cellDate(cell);
+ var d1 = realCellToDate(cell);
var d2 = addMinutes(cloneDate(d1), opt('defaultEventMinutes'));
renderSlotOverlay(d1, d2);
}
@@ -3670,35 +3693,32 @@ function AgendaView(element, calendar, viewName) {
var cell = hoverListener.stop();
clearOverlays();
if (cell) {
- trigger('drop', _dragElement, cellDate(cell), cellIsAllDay(cell), ev, ui);
+ trigger('drop', _dragElement, realCellToDate(cell), getIsCellAllDay(cell), ev, ui);
}
}
-
+
}
+;;
+
function AgendaEventRenderer() {
var t = this;
// exports
t.renderEvents = renderEvents;
- t.compileDaySegs = compileDaySegs; // for DayEventRenderer
t.clearEvents = clearEvents;
t.slotSegHtml = slotSegHtml;
- t.bindDaySeg = bindDaySeg;
// imports
DayEventRenderer.call(t);
var opt = t.opt;
var trigger = t.trigger;
- //var setOverflowHidden = t.setOverflowHidden;
var isEventDraggable = t.isEventDraggable;
var isEventResizable = t.isEventResizable;
var eventEnd = t.eventEnd;
- var reportEvents = t.reportEvents;
- var reportEventClear = t.reportEventClear;
var eventElementHandlers = t.eventElementHandlers;
var setHeight = t.setHeight;
var getDaySegmentContainer = t.getDaySegmentContainer;
@@ -3707,14 +3727,15 @@ function AgendaEventRenderer() {
var getMaxMinute = t.getMaxMinute;
var getMinMinute = t.getMinMinute;
var timePosition = t.timePosition;
+ var getIsCellAllDay = t.getIsCellAllDay;
var colContentLeft = t.colContentLeft;
var colContentRight = t.colContentRight;
- var renderDaySegs = t.renderDaySegs;
- var resizableDayEvent = t.resizableDayEvent; // TODO: streamline binding architecture
+ var cellToDate = t.cellToDate;
var getColCnt = t.getColCnt;
var getColWidth = t.getColWidth;
- var getSlotHeight = t.getSlotHeight;
- var getBodyContent = t.getBodyContent;
+ var getSnapHeight = t.getSnapHeight;
+ var getSnapMinutes = t.getSnapMinutes;
+ var getSlotContainer = t.getSlotContainer;
var reportEventElement = t.reportEventElement;
var showEvents = t.showEvents;
var hideEvents = t.hideEvents;
@@ -3722,19 +3743,22 @@ function AgendaEventRenderer() {
var eventResize = t.eventResize;
var renderDayOverlay = t.renderDayOverlay;
var clearOverlays = t.clearOverlays;
+ var renderDayEvents = t.renderDayEvents;
var calendar = t.calendar;
var formatDate = calendar.formatDate;
var formatDates = calendar.formatDates;
var timeLineInterval;
+ // overrides
+ t.draggableDayEvent = draggableDayEvent;
+
/* Rendering
----------------------------------------------------------------------------*/
function renderEvents(events, modifiedEventId) {
- reportEvents(events);
var i, len=events.length,
dayEvents=[],
slotEvents=[];
@@ -3745,10 +3769,12 @@ function AgendaEventRenderer() {
slotEvents.push(events[i]);
}
}
+
if (opt('allDaySlot')) {
- renderDaySegs(compileDaySegs(dayEvents), modifiedEventId);
+ renderDayEvents(dayEvents, modifiedEventId);
setHeight(); // no params means set to viewHeight
}
+
renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
if (opt('currentTimeIndicator')) {
@@ -3760,58 +3786,85 @@ function AgendaEventRenderer() {
function clearEvents() {
- reportEventClear();
getDaySegmentContainer().empty();
getSlotSegmentContainer().empty();
}
-
-
- function compileDaySegs(events) {
- var levels = stackSegs(sliceSegs(events, $.map(events, exclEndDay), t.visStart, t.visEnd)),
- i, levelCnt=levels.length, level,
- j, seg,
- segs=[];
- for (i=0; i<levelCnt; i++) {
- level = levels[i];
- for (j=0; j<level.length; j++) {
- seg = level[j];
- seg.row = 0;
- seg.level = i; // not needed anymore
- segs.push(seg);
- }
- }
- return segs;
- }
-
+
function compileSlotSegs(events) {
var colCnt = getColCnt(),
minMinute = getMinMinute(),
maxMinute = getMaxMinute(),
- d = addMinutes(cloneDate(t.visStart), minMinute),
+ d,
visEventEnds = $.map(events, slotEventEnd),
- i, col,
- j, level,
- k, seg,
- segs=[];
+ i,
+ j, seg,
+ colSegs,
+ segs = [];
+
for (i=0; i<colCnt; i++) {
- col = stackSegs(sliceSegs(events, visEventEnds, d, addMinutes(cloneDate(d), maxMinute-minMinute)));
- countForwardSegs(col);
- for (j=0; j<col.length; j++) {
- level = col[j];
- for (k=0; k<level.length; k++) {
- seg = level[k];
- seg.col = i;
- seg.level = j;
- segs.push(seg);
- }
+
+ d = cellToDate(0, i);
+ addMinutes(d, minMinute);
+
+ colSegs = sliceSegs(
+ events,
+ visEventEnds,
+ d,
+ addMinutes(cloneDate(d), maxMinute-minMinute)
+ );
+
+ colSegs = placeSlotSegs(colSegs); // returns a new order
+
+ for (j=0; j<colSegs.length; j++) {
+ seg = colSegs[j];
+ seg.col = i;
+ segs.push(seg);
}
- addDays(d, 1, true);
}
+
return segs;
}
-
-
+
+
+ function sliceSegs(events, visEventEnds, start, end) {
+ var segs = [],
+ i, len=events.length, event,
+ eventStart, eventEnd,
+ segStart, segEnd,
+ isStart, isEnd;
+ for (i=0; i<len; i++) {
+ event = events[i];
+ eventStart = event.start;
+ eventEnd = visEventEnds[i];
+ if (eventEnd > start && eventStart < end) {
+ if (eventStart < start) {
+ segStart = cloneDate(start);
+ isStart = false;
+ }else{
+ segStart = eventStart;
+ isStart = true;
+ }
+ if (eventEnd > end) {
+ segEnd = cloneDate(end);
+ isEnd = false;
+ }else{
+ segEnd = eventEnd;
+ isEnd = true;
+ }
+ segs.push({
+ event: event,
+ start: segStart,
+ end: segEnd,
+ isStart: isStart,
+ isEnd: isEnd
+ });
+ }
+ }
+ return segs.sort(compareSlotSegs);
+ }
+
+
function slotEventEnd(event) {
if (event.end) {
return cloneDate(event.end);
@@ -3822,39 +3875,30 @@ function AgendaEventRenderer() {
// renders events in the 'time slots' at the bottom
+ // TODO: when we refactor this, when user returns `false` eventRender, don't have empty space
+ // TODO: refactor will include using pixels to detect collisions instead of dates (handy for seg cmp)
function renderSlotSegs(segs, modifiedEventId) {
var i, segCnt=segs.length, seg,
event,
- classes,
- top, bottom,
- colI, levelI, forward,
- leftmost,
- availWidth,
- outerWidth,
+ top,
+ bottom,
+ columnLeft,
+ columnRight,
+ columnWidth,
+ width,
left,
- html='',
+ right,
+ html = '',
eventElements,
eventElement,
triggerRes,
- vsideCache={},
- hsideCache={},
- key, val,
contentElement,
height,
slotSegmentContainer = getSlotSegmentContainer(),
- rtl, dis, dit,
- colCnt = getColCnt(),
- overlapping = colCnt > 1;
-
- if (rtl = opt('isRTL')) {
- dis = -1;
- dit = colCnt - 1;
- }else{
- dis = 1;
- dit = 0;
- }
+ isRTL = opt('isRTL'),
+ colCnt = getColCnt();
// calculate position/dimensions, create html
for (i=0; i<segCnt; i++) {
@@ -3862,36 +3906,49 @@ function AgendaEventRenderer() {
event = seg.event;
top = timePosition(seg.start, seg.start);
bottom = timePosition(seg.start, seg.end);
- colI = seg.col;
- levelI = seg.level;
- forward = seg.forward || 0;
- leftmost = colContentLeft(colI*dis + dit);
- availWidth = colContentRight(colI*dis + dit) - leftmost;
- availWidth = Math.min(availWidth-6, availWidth*.95); // TODO: move this to CSS
- if (levelI) {
- // indented and thin
- outerWidth = availWidth / (levelI + forward + 1);
- }else{
- if (forward) {
- if (overlapping) { // moderately wide, aligned left still
- outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
- }else{
- outerWidth = outerWidth = availWidth / (forward + 1);
- }
- }else{
- // can be entire width, aligned left
- outerWidth = availWidth;
- }
+ columnLeft = colContentLeft(seg.col);
+ columnRight = colContentRight(seg.col);
+ columnWidth = columnRight - columnLeft;
+
+ // shave off space on right near scrollbars (2.5%)
+ // TODO: move this to CSS somehow
+ columnRight -= columnWidth * .025;
+ columnWidth = columnRight - columnLeft;
+
+ width = columnWidth * (seg.forwardCoord - seg.backwardCoord);
+
+ // bruederli at kolabsys.com: always disable slotEventOverlap in single day view
+ if (opt('slotEventOverlap') && colCnt > 1) {
+ // double the width while making sure resize handle is visible
+ // (assumed to be 20px wide)
+ width = Math.max(
+ (width - (20/2)) * 2,
+ width // narrow columns will want to make the segment smaller than
+ // the natural width. don't allow it
+ );
+ }
+
+ if (isRTL) {
+ right = columnRight - seg.backwardCoord * columnWidth;
+ left = right - width;
}
- left = leftmost + // leftmost possible
- (availWidth / (levelI + forward + 1) * levelI) // indentation
- * dis + (rtl ? availWidth - outerWidth : 0); // rtl
+ else {
+ left = columnLeft + seg.backwardCoord * columnWidth;
+ right = left + width;
+ }
+
+ // make sure horizontal coordinates are in bounds
+ left = Math.max(left, columnLeft);
+ right = Math.min(right, columnRight);
+ width = right - left;
+
seg.top = top;
seg.left = left;
- seg.outerWidth = outerWidth - (overlapping ? 0 : 1);
+ seg.outerWidth = width;
seg.outerHeight = bottom - top;
html += slotSegHtml(event, seg);
}
+
slotSegmentContainer[0].innerHTML = html; // faster than html()
eventElements = slotSegmentContainer.children();
@@ -3930,11 +3987,9 @@ function AgendaEventRenderer() {
for (i=0; i<segCnt; i++) {
seg = segs[i];
if (eventElement = seg.element) {
- val = vsideCache[key = seg.key = cssKey(eventElement[0])];
- seg.vsides = val === undefined ? (vsideCache[key] = vsides(eventElement, true)) : val;
- val = hsideCache[key];
- seg.hsides = val === undefined ? (hsideCache[key] = hsides(eventElement, true)) : val;
- contentElement = eventElement.find('div.fc-event-content');
+ seg.vsides = vsides(eventElement, true);
+ seg.hsides = hsides(eventElement, true);
+ contentElement = eventElement.find('.fc-event-content');
if (contentElement.length) {
seg.contentTop = contentElement[0].offsetTop;
}
@@ -3950,7 +4005,7 @@ function AgendaEventRenderer() {
eventElement[0].style.height = height + 'px';
event = seg.event;
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 (TODO: maybe make both display:inline instead)
eventElement.find('div.fc-event-time')
.text(formatDate(event.start, opt('timeFormat')) + ' - ' + event.title);
eventElement.find('div.fc-event-title')
@@ -3973,10 +4028,10 @@ function AgendaEventRenderer() {
classes.push('fc-event-draggable');
}
if (seg.isStart) {
- classes.push('fc-corner-top');
+ classes.push('fc-event-start');
}
if (seg.isEnd) {
- classes.push('fc-corner-bottom');
+ classes.push('fc-event-end');
}
classes = classes.concat(event.className);
if (event.source) {
@@ -3989,7 +4044,13 @@ function AgendaEventRenderer() {
}
html +=
" class='" + classes.join(' ') + "'" +
- " style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px;" + skinCss + "'" +
+ " style=" +
+ "'" +
+ "position:absolute;" +
+ "top:" + seg.top + "px;" +
+ "left:" + seg.left + "px;" +
+ skinCss +
+ "'" +
">" +
"<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
"<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
@@ -3999,7 +4060,7 @@ function AgendaEventRenderer() {
"</div>" +
"<div class='fc-event-content'>" +
"<div class='fc-event-title'>" +
- htmlEscape(event.title) +
+ htmlEscape(event.title || '') +
"</div>" +
"</div>" +
"<div class='fc-event-bg'></div>" +
@@ -4014,18 +4075,6 @@ function AgendaEventRenderer() {
}
- function bindDaySeg(event, eventElement, seg) {
- if (isEventDraggable(event)) {
- draggableDayEvent(event, eventElement, seg.isStart);
- }
- if (seg.isEnd && isEventResizable(event)) {
- resizableDayEvent(event, eventElement, seg);
- }
- eventElementHandlers(event, eventElement);
- // needs to be after, because resizableDayEvent might stopImmediatePropagation on click
- }
-
-
function bindSlotSeg(event, eventElement, seg) {
var timeElement = eventElement.find('div.fc-event-time');
if (isEventDraggable(event)) {
@@ -4041,7 +4090,7 @@ function AgendaEventRenderer() {
// draw a horizontal line indicating the current time (#143)
function setTimeIndicator()
{
- var container = getBodyContent();
+ var container = getSlotContainer();
var timeline = container.children('.fc-timeline');
if (timeline.length == 0) { // if timeline isn't there, add it
timeline = $('<hr>').addClass('fc-timeline').appendTo(container);
@@ -4075,31 +4124,34 @@ function AgendaEventRenderer() {
// when event starts out FULL-DAY
+ // overrides DayEventRenderer's version because it needs to account for dragging elements
+ // to and from the slot area.
- function draggableDayEvent(event, eventElement, isStart) {
+ function draggableDayEvent(event, eventElement, seg) {
+ var isStart = seg.isStart;
var origWidth;
var revert;
- var allDay=true;
+ var allDay = true;
var dayDelta;
- var dis = opt('isRTL') ? -1 : 1;
var hoverListener = getHoverListener();
var colWidth = getColWidth();
- var slotHeight = getSlotHeight();
+ var snapHeight = getSnapHeight();
+ var snapMinutes = getSnapMinutes();
var minMinute = getMinMinute();
eventElement.draggable({
- zIndex: 9,
opacity: opt('dragOpacity', 'month'), // use whatever the month view was using
revertDuration: opt('dragRevertDuration'),
start: function(ev, ui) {
trigger('eventDragStart', eventElement, event, ev, ui);
hideEvents(event, eventElement);
origWidth = eventElement.width();
- hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+ hoverListener.start(function(cell, origCell) {
clearOverlays();
if (cell) {
- //setOverflowHidden(true);
revert = false;
- dayDelta = colDelta * dis;
+ var origDate = cellToDate(0, origCell.col);
+ var date = cellToDate(0, cell.col);
+ dayDelta = dayDiff(date, origDate);
if (!cell.row) {
// on full-days
renderDayOverlay(
@@ -4115,9 +4167,9 @@ function AgendaEventRenderer() {
eventElement.width(colWidth - 10); // don't use entire width
setOuterHeight(
eventElement,
- slotHeight * Math.round(
- (event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
- / opt('slotMinutes')
+ snapHeight * Math.round(
+ (event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes')) /
+ snapMinutes
)
);
eventElement.draggable('option', 'grid', [colWidth, 1]);
@@ -4130,7 +4182,6 @@ function AgendaEventRenderer() {
revert = revert || (allDay && !dayDelta);
}else{
resetElement();
- //setOverflowHidden(false);
revert = true;
}
eventElement.draggable('option', 'revert', revert);
@@ -4149,14 +4200,13 @@ function AgendaEventRenderer() {
// changed!
var minuteDelta = 0;
if (!allDay) {
- minuteDelta = Math.round((eventElement.offset().top - getBodyContent().offset().top) / slotHeight)
- * opt('slotMinutes')
+ minuteDelta = Math.round((eventElement.offset().top - getSlotContainer().offset().top) / snapHeight)
+ * snapMinutes
+ minMinute
- (event.start.getHours() * 60 + event.start.getMinutes());
}
eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui);
}
- //setOverflowHidden(false);
}
});
function resetElement() {
@@ -4174,78 +4224,147 @@ function AgendaEventRenderer() {
// when event starts out IN TIMESLOTS
function draggableSlotEvent(event, eventElement, timeElement) {
- var origPosition;
- var allDay=false;
- var dayDelta;
- var minuteDelta;
- var prevMinuteDelta;
- var dis = opt('isRTL') ? -1 : 1;
- var hoverListener = getHoverListener();
+ var coordinateGrid = t.getCoordinateGrid();
var colCnt = getColCnt();
var colWidth = getColWidth();
- var slotHeight = getSlotHeight();
+ var snapHeight = getSnapHeight();
+ var snapMinutes = getSnapMinutes();
+
+ // states
+ var origPosition; // original position of the element, not the mouse
+ var origCell;
+ var isInBounds, prevIsInBounds;
+ var isAllDay, prevIsAllDay;
+ var colDelta, prevColDelta;
+ var dayDelta; // derived from colDelta
+ var minuteDelta, prevMinuteDelta;
+
eventElement.draggable({
- zIndex: 9,
scroll: false,
- grid: [colWidth, slotHeight],
+ grid: [ colWidth, snapHeight ],
axis: colCnt==1 ? 'y' : false,
opacity: opt('dragOpacity'),
revertDuration: opt('dragRevertDuration'),
start: function(ev, ui) {
+
trigger('eventDragStart', eventElement, event, ev, ui);
hideEvents(event, eventElement);
+
+ coordinateGrid.build();
+
+ // initialize states
origPosition = eventElement.position();
+ origCell = coordinateGrid.cell(ev.pageX, ev.pageY);
+ isInBounds = prevIsInBounds = true;
+ isAllDay = prevIsAllDay = getIsCellAllDay(origCell);
+ colDelta = prevColDelta = 0;
+ dayDelta = 0;
minuteDelta = prevMinuteDelta = 0;
- hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
- eventElement.draggable('option', 'revert', !cell);
- clearOverlays();
- if (cell) {
- dayDelta = colDelta * dis;
- if (opt('allDaySlot') && !cell.row) {
- // over full days
- if (!allDay) {
- // convert to temporary all-day event
- allDay = true;
- timeElement.hide();
- eventElement.draggable('option', 'grid', null);
- }
- renderDayOverlay(
- addDays(cloneDate(event.start), dayDelta),
- addDays(exclEndDay(event), dayDelta)
- );
- }else{
- // on slots
- resetElement();
- }
- }
- }, ev, 'drag');
+
},
drag: function(ev, ui) {
- minuteDelta = Math.round((ui.position.top - origPosition.top) / slotHeight) * opt('slotMinutes');
- if (minuteDelta != prevMinuteDelta) {
- if (!allDay) {
- updateTimeText(minuteDelta);
+
+ // NOTE: this `cell` value is only useful for determining in-bounds and all-day.
+ // Bad for anything else due to the discrepancy between the mouse position and the
+ // element position while snapping. (problem revealed in PR #55)
+ //
+ // PS- the problem exists for draggableDayEvent() when dragging an all-day event to a slot event.
+ // We should overhaul the dragging system and stop relying on jQuery UI.
+ var cell = coordinateGrid.cell(ev.pageX, ev.pageY);
+
+ // update states
+ isInBounds = !!cell;
+ if (isInBounds) {
+ isAllDay = getIsCellAllDay(cell);
+
+ // calculate column delta
+ colDelta = Math.round((ui.position.left - origPosition.left) / colWidth);
+ if (colDelta != prevColDelta) {
+ // calculate the day delta based off of the original clicked column and the column delta
+ var origDate = cellToDate(0, origCell.col);
+ var col = origCell.col + colDelta;
+ col = Math.max(0, col);
+ col = Math.min(colCnt-1, col);
+ var date = cellToDate(0, col);
+ dayDelta = dayDiff(date, origDate);
+ }
+
+ // calculate minute delta (only if over slots)
+ if (!isAllDay) {
+ minuteDelta = Math.round((ui.position.top - origPosition.top) / snapHeight) * snapMinutes;
}
+ }
+
+ // any state changes?
+ if (
+ isInBounds != prevIsInBounds ||
+ isAllDay != prevIsAllDay ||
+ colDelta != prevColDelta ||
+ minuteDelta != prevMinuteDelta
+ ) {
+
+ updateUI();
+
+ // update previous states for next time
+ prevIsInBounds = isInBounds;
+ prevIsAllDay = isAllDay;
+ prevColDelta = colDelta;
prevMinuteDelta = minuteDelta;
}
+
+ // if out-of-bounds, revert when done, and vice versa.
+ eventElement.draggable('option', 'revert', !isInBounds);
+
},
stop: function(ev, ui) {
- var cell = hoverListener.stop();
+
clearOverlays();
trigger('eventDragStop', eventElement, event, ev, ui);
- if (cell && (dayDelta || minuteDelta || allDay)) {
- // changed!
- eventDrop(this, event, dayDelta, allDay ? 0 : minuteDelta, allDay, ev, ui);
- }else{
- // either no change or out-of-bounds (draggable has already reverted)
- resetElement();
+
+ if (isInBounds && (isAllDay || dayDelta || minuteDelta)) { // changed!
+ eventDrop(this, event, dayDelta, isAllDay ? 0 : minuteDelta, isAllDay, ev, ui);
+ }
+ else { // either no change or out-of-bounds (draggable has already reverted)
+
+ // reset states for next time, and for updateUI()
+ isInBounds = true;
+ isAllDay = false;
+ colDelta = 0;
+ dayDelta = 0;
+ minuteDelta = 0;
+
+ updateUI();
eventElement.css('filter', ''); // clear IE opacity side-effects
- eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position
- updateTimeText(0);
+
+ // sometimes fast drags make event revert to wrong position, so reset.
+ // also, if we dragged the element out of the area because of snapping,
+ // but the *mouse* is still in bounds, we need to reset the position.
+ eventElement.css(origPosition);
+
showEvents(event, eventElement);
}
}
});
+
+ function updateUI() {
+ clearOverlays();
+ if (isInBounds) {
+ if (isAllDay) {
+ timeElement.hide();
+ eventElement.draggable('option', 'grid', null); // disable grid snapping
+ renderDayOverlay(
+ addDays(cloneDate(event.start), dayDelta),
+ addDays(exclEndDay(event), dayDelta)
+ );
+ }
+ else {
+ updateTimeText(minuteDelta);
+ timeElement.css('display', ''); // show() was causing display=inline
+ eventElement.draggable('option', 'grid', [colWidth, snapHeight]); // re-enable grid snapping
+ }
+ }
+ }
+
function updateTimeText(minuteDelta) {
var newStart = addMinutes(cloneDate(event.start), minuteDelta);
var newEnd;
@@ -4254,14 +4373,7 @@ function AgendaEventRenderer() {
}
timeElement.text(formatDates(newStart, newEnd, opt('timeFormat')));
}
- function resetElement() {
- // convert back to original slot-event
- if (allDay) {
- timeElement.css('display', ''); // show() was causing display=inline
- eventElement.draggable('option', 'grid', [colWidth, slotHeight]);
- allDay = false;
- }
- }
+
}
@@ -4271,40 +4383,39 @@ function AgendaEventRenderer() {
function resizableSlotEvent(event, eventElement, timeElement) {
- var slotDelta, prevSlotDelta;
- var slotHeight = getSlotHeight();
+ var snapDelta, prevSnapDelta;
+ var snapHeight = getSnapHeight();
+ var snapMinutes = getSnapMinutes();
eventElement.resizable({
handles: {
- s: 'div.ui-resizable-s'
+ s: '.ui-resizable-handle'
},
- grid: slotHeight,
+ grid: snapHeight,
start: function(ev, ui) {
- slotDelta = prevSlotDelta = 0;
+ snapDelta = prevSnapDelta = 0;
hideEvents(event, eventElement);
- eventElement.css('z-index', 9);
trigger('eventResizeStart', this, event, ev, ui);
},
resize: function(ev, ui) {
// don't rely on ui.size.height, doesn't take grid into account
- slotDelta = Math.round((Math.max(slotHeight, eventElement.height()) - ui.originalSize.height) / slotHeight);
- if (slotDelta != prevSlotDelta) {
+ snapDelta = Math.round((Math.max(snapHeight, eventElement.height()) - ui.originalSize.height) / snapHeight);
+ if (snapDelta != prevSnapDelta) {
timeElement.text(
formatDates(
event.start,
- (!slotDelta && !event.end) ? null : // no change, so don't display time range
- addMinutes(eventEnd(event), opt('slotMinutes')*slotDelta),
+ (!snapDelta && !event.end) ? null : // no change, so don't display time range
+ addMinutes(eventEnd(event), snapMinutes*snapDelta),
opt('timeFormat')
)
);
- prevSlotDelta = slotDelta;
+ prevSnapDelta = snapDelta;
}
},
stop: function(ev, ui) {
trigger('eventResizeStop', this, event, ev, ui);
- if (slotDelta) {
- eventResize(this, event, 0, opt('slotMinutes')*slotDelta, ev, ui);
+ if (snapDelta) {
+ eventResize(this, event, 0, snapMinutes*snapDelta, ev, ui);
}else{
- eventElement.css('z-index', 8);
showEvents(event, eventElement);
// BUG: if event was really short, need to put title back in span
}
@@ -4316,23 +4427,773 @@ function AgendaEventRenderer() {
}
-function countForwardSegs(levels) {
- var i, j, k, level, segForward, segBack;
- for (i=levels.length-1; i>0; i--) {
+
+/* Agenda Event Segment Utilities
+-----------------------------------------------------------------------------*/
+
+
+// Sets the seg.backwardCoord and seg.forwardCoord on each segment and returns a new
+// list in the order they should be placed into the DOM (an implicit z-index).
+function placeSlotSegs(segs) {
+ var levels = buildSlotSegLevels(segs);
+ var level0 = levels[0];
+ var i;
+
+ computeForwardSlotSegs(levels);
+
+ if (level0) {
+
+ for (i=0; i<level0.length; i++) {
+ computeSlotSegPressures(level0[i]);
+ }
+
+ for (i=0; i<level0.length; i++) {
+ computeSlotSegCoords(level0[i], 0, 0);
+ }
+ }
+
+ return flattenSlotSegLevels(levels);
+}
+
+
+// Builds an array of segments "levels". The first level will be the leftmost tier of segments
+// if the calendar is left-to-right, or the rightmost if the calendar is right-to-left.
+function buildSlotSegLevels(segs) {
+ var levels = [];
+ var i, seg;
+ var j;
+
+ for (i=0; i<segs.length; i++) {
+ seg = segs[i];
+
+ // go through all the levels and stop on the first level where there are no collisions
+ for (j=0; j<levels.length; j++) {
+ if (!computeSlotSegCollisions(seg, levels[j]).length) {
+ break;
+ }
+ }
+
+ (levels[j] || (levels[j] = [])).push(seg);
+ }
+
+ return levels;
+}
+
+
+// For every segment, figure out the other segments that are in subsequent
+// levels that also occupy the same vertical space. Accumulate in seg.forwardSegs
+function computeForwardSlotSegs(levels) {
+ var i, level;
+ var j, seg;
+ var k;
+
+ for (i=0; i<levels.length; i++) {
level = levels[i];
+
for (j=0; j<level.length; j++) {
- segForward = level[j];
- for (k=0; k<levels[i-1].length; k++) {
- segBack = levels[i-1][k];
- if (segsCollide(segForward, segBack)) {
- segBack.forward = Math.max(segBack.forward||0, (segForward.forward||0)+1);
+ seg = level[j];
+
+ seg.forwardSegs = [];
+ for (k=i+1; k<levels.length; k++) {
+ computeSlotSegCollisions(seg, levels[k], seg.forwardSegs);
+ }
+ }
+ }
+}
+
+
+// Figure out which path forward (via seg.forwardSegs) results in the longest path until
+// the furthest edge is reached. The number of segments in this path will be seg.forwardPressure
+function computeSlotSegPressures(seg) {
+ var forwardSegs = seg.forwardSegs;
+ var forwardPressure = 0;
+ var i, forwardSeg;
+
+ if (seg.forwardPressure === undefined) { // not already computed
+
+ for (i=0; i<forwardSegs.length; i++) {
+ forwardSeg = forwardSegs[i];
+
+ // figure out the child's maximum forward path
+ computeSlotSegPressures(forwardSeg);
+
+ // either use the existing maximum, or use the child's forward pressure
+ // plus one (for the forwardSeg itself)
+ forwardPressure = Math.max(
+ forwardPressure,
+ 1 + forwardSeg.forwardPressure
+ );
+ }
+
+ seg.forwardPressure = forwardPressure;
+ }
+}
+
+
+// Calculate seg.forwardCoord and seg.backwardCoord for the segment, where both values range
+// from 0 to 1. If the calendar is left-to-right, the seg.backwardCoord maps to "left" and
+// seg.forwardCoord maps to "right" (via percentage). Vice-versa if the calendar is right-to-left.
+//
+// The segment might be part of a "series", which means consecutive segments with the same pressure
+// who's width is unknown until an edge has been hit. `seriesBackwardPressure` is the number of
+// segments behind this one in the current series, and `seriesBackwardCoord` is the starting
+// coordinate of the first segment in the series.
+function computeSlotSegCoords(seg, seriesBackwardPressure, seriesBackwardCoord) {
+ var forwardSegs = seg.forwardSegs;
+ var i;
+
+ if (seg.forwardCoord === undefined) { // not already computed
+
+ if (!forwardSegs.length) {
+
+ // if there are no forward segments, this segment should butt up against the edge
+ seg.forwardCoord = 1;
+ }
+ else {
+
+ // sort highest pressure first
+ forwardSegs.sort(compareForwardSlotSegs);
+
+ // this segment's forwardCoord will be calculated from the backwardCoord of the
+ // highest-pressure forward segment.
+ computeSlotSegCoords(forwardSegs[0], seriesBackwardPressure + 1, seriesBackwardCoord);
+ seg.forwardCoord = forwardSegs[0].backwardCoord;
+ }
+
+ // calculate the backwardCoord from the forwardCoord. consider the series
+ seg.backwardCoord = seg.forwardCoord -
+ (seg.forwardCoord - seriesBackwardCoord) / // available width for series
+ (seriesBackwardPressure + 1); // # of segments in the series
+
+ // use this segment's coordinates to computed the coordinates of the less-pressurized
+ // forward segments
+ for (i=0; i<forwardSegs.length; i++) {
+ computeSlotSegCoords(forwardSegs[i], 0, seg.forwardCoord);
+ }
+ }
+}
+
+
+// Outputs a flat array of segments, from lowest to highest level
+function flattenSlotSegLevels(levels) {
+ var segs = [];
+ var i, level;
+ var j;
+
+ for (i=0; i<levels.length; i++) {
+ level = levels[i];
+
+ for (j=0; j<level.length; j++) {
+ segs.push(level[j]);
+ }
+ }
+
+ return segs;
+}
+
+
+// Find all the segments in `otherSegs` that vertically collide with `seg`.
+// Append into an optionally-supplied `results` array and return.
+function computeSlotSegCollisions(seg, otherSegs, results) {
+ results = results || [];
+
+ for (var i=0; i<otherSegs.length; i++) {
+ if (isSlotSegCollision(seg, otherSegs[i])) {
+ results.push(otherSegs[i]);
+ }
+ }
+
+ return results;
+}
+
+
+// Do these segments occupy the same vertical space?
+function isSlotSegCollision(seg1, seg2) {
+ return seg1.end > seg2.start && seg1.start < seg2.end;
+}
+
+
+// A cmp function for determining which forward segment to rely on more when computing coordinates.
+function compareForwardSlotSegs(seg1, seg2) {
+ // put higher-pressure first
+ return seg2.forwardPressure - seg1.forwardPressure ||
+ // put segments that are closer to initial edge first (and favor ones with no coords yet)
+ (seg1.backwardCoord || 0) - (seg2.backwardCoord || 0) ||
+ // do normal sorting...
+ compareSlotSegs(seg1, seg2);
+}
+
+
+// A cmp function for determining which segment should be closer to the initial edge
+// (the left edge on a left-to-right calendar).
+function compareSlotSegs(seg1, seg2) {
+ return seg1.start - seg2.start || // earlier start time goes first
+ (seg2.end - seg2.start) - (seg1.end - seg1.start) || // tie? longer-duration goes first
+ (seg1.event.title || '').localeCompare(seg2.event.title); // tie? alphabetically by title
+}
+
+
+;;
+
+/* Additional view: list (by bruederli at kolabsys.com)
+---------------------------------------------------------------------------------*/
+
+fcViews.list = ListView;
+
+
+function ListView(element, calendar) {
+ var t = this;
+
+ // exports
+ t.render = render;
+ t.select = dummy;
+ t.unselect = dummy;
+ t.reportSelection = dummy;
+ t.getDaySegmentContainer = function(){ return body; };
+
+ // imports
+ View.call(t, element, calendar, 'list');
+ ListEventRenderer.call(t);
+ var opt = t.opt;
+ var trigger = t.trigger;
+ var clearEvents = t.clearEvents;
+ var reportEventClear = t.reportEventClear;
+ var formatDates = calendar.formatDates;
+ var formatDate = calendar.formatDate;
+
+ // overrides
+ t.setWidth = setWidth;
+ t.setHeight = setHeight;
+
+ // locals
+ var body;
+ var firstDay;
+ var nwe;
+ var tm;
+ var colFormat;
+
+
+ function render(date, delta) {
+ if (delta) {
+ addDays(date, opt('listPage') * delta);
+ }
+ t.start = t.visStart = cloneDate(date, true);
+ t.end = addDays(cloneDate(t.start), opt('listPage'));
+ t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
+ addMinutes(t.visEnd, -1); // set end to 23:59
+ t.title = formatDates(date, t.visEnd, opt('titleFormat'));
+
+ updateOptions();
+
+ if (!body) {
+ buildSkeleton();
+ } else {
+ clearEvents();
+ }
+ }
+
+
+ function updateOptions() {
+ firstDay = opt('firstDay');
+ nwe = opt('weekends') ? 0 : 1;
+ tm = opt('theme') ? 'ui' : 'fc';
+ colFormat = opt('columnFormat', 'day');
+ }
+
+
+ function buildSkeleton() {
+ body = $('<div>').addClass('fc-list-content').appendTo(element);
+ }
+
+ function setHeight(height, dateChanged) {
+ if (!opt('listNoHeight'))
+ body.css('height', (height-1)+'px').css('overflow', 'auto');
+ }
+
+ function setWidth(width) {
+ // nothing to be done here
+ }
+
+ function dummy() {
+ // Stub.
+ }
+
+}
+
+;;
+
+/* Additional view renderer: list (by bruederli at kolabsys.com)
+---------------------------------------------------------------------------------*/
+
+function ListEventRenderer() {
+ var t = this;
+
+ // exports
+ t.renderEvents = renderEvents;
+ t.renderEventTime = renderEventTime;
+ t.compileDaySegs = compileSegs; // for DayEventRenderer
+ t.clearEvents = clearEvents;
+ t.lazySegBind = lazySegBind;
+ t.sortCmp = sortCmp;
+
+ // imports
+ DayEventRenderer.call(t);
+ var opt = t.opt;
+ var trigger = t.trigger;
+ var reportEventElement = t.reportEventElement;
+ var eventElementHandlers = t.eventElementHandlers;
+ var showEvents = t.showEvents;
+ var hideEvents = t.hideEvents;
+ var getListContainer = t.getDaySegmentContainer;
+ var calendar = t.calendar;
+ var formatDate = calendar.formatDate;
+ var formatDates = calendar.formatDates;
+
+
+ /* Rendering
+ --------------------------------------------------------------------*/
+
+ function clearEvents() {
+ getListContainer().empty();
+ }
+
+ function renderEvents(events, modifiedEventId) {
+ events.sort(sortCmp);
+ renderSegs(compileSegs(events), modifiedEventId);
+ }
+
+ function compileSegs(events) {
+ var segs = [];
+ var colFormat = opt('titleFormat', 'day');
+ var firstDay = opt('firstDay');
+ var segmode = opt('listSections');
+ var event, i, dd, wd, md, seg, segHash, curSegHash, segDate, curSeg = -1;
+ var today = clearTime(new Date());
+ var weekstart = addDays(cloneDate(today), -((today.getDay() - firstDay + 7) % 7));
+
+ for (i=0; i < events.length; i++) {
+ event = events[i];
+
+ // skip events out of range
+ if ((event.end || event.start) < t.start || event.start > t.visEnd)
+ continue;
+
+ // define sections of this event
+ // create smart sections such as today, tomorrow, this week, next week, next month, ect.
+ segDate = cloneDate(event.start < t.start && event.end > t.start ? t.start : event.start, true);
+ dd = dayDiff(segDate, today);
+ wd = Math.floor(dayDiff(segDate, weekstart) / 7);
+ md = segDate.getMonth() + ((segDate.getYear() - today.getYear()) * 12) - today.getMonth();
+
+ // build section title
+ if (segmode == 'smart') {
+ if (dd < 0) {
+ segHash = opt('listTexts', 'past');
+ } else if (dd == 0) {
+ segHash = opt('listTexts', 'today');
+ } else if (dd == 1) {
+ segHash = opt('listTexts', 'tomorrow');
+ } else if (wd == 0) {
+ segHash = opt('listTexts', 'thisWeek');
+ } else if (wd == 1) {
+ segHash = opt('listTexts', 'nextWeek');
+ } else if (md == 0) {
+ segHash = opt('listTexts', 'thisMonth');
+ } else if (md == 1) {
+ segHash = opt('listTexts', 'nextMonth');
+ } else if (md > 1) {
+ segHash = opt('listTexts', 'future');
}
+ } else if (segmode == 'month') {
+ segHash = formatDate(segDate, 'MMMM yyyy');
+ } else if (segmode == 'week') {
+ segHash = opt('listTexts', 'week') + formatDate(segDate, ' W');
+ } else if (segmode == 'day') {
+ segHash = formatDate(segDate, colFormat);
+ } else {
+ segHash = '';
}
+
+ // start new segment
+ if (segHash != curSegHash) {
+ segs[++curSeg] = { events: [], start: segDate, title: segHash, daydiff: dd, weekdiff: wd, monthdiff: md };
+ curSegHash = segHash;
+ }
+
+ segs[curSeg].events.push(event);
}
+
+ return segs;
+ }
+
+ function sortCmp(a, b) {
+ var sd = a.start.getTime() - b.start.getTime();
+ return sd || (a.end ? a.end.getTime() : 0) - (b.end ? b.end.getTime() : 0);
}
+
+ function renderSegs(segs, modifiedEventId) {
+ var tm = opt('theme') ? 'ui' : 'fc';
+ var headerClass = tm + "-widget-header";
+ var contentClass = tm + "-widget-content";
+ var i, j, seg, event, times, s, skinCss, skinCssAttr, classes, segContainer, eventElement, eventElements, triggerRes;
+
+ for (j=0; j < segs.length; j++) {
+ seg = segs[j];
+
+ if (seg.title) {
+ $('<div class="fc-list-header ' + headerClass + '">' + htmlEscape(seg.title) + '</div>').appendTo(getListContainer());
+ }
+ segContainer = $('<div>').addClass('fc-list-section ' + contentClass).appendTo(getListContainer());
+ s = '';
+
+ for (i=0; i < seg.events.length; i++) {
+ event = seg.events[i];
+ times = renderEventTime(event, seg);
+ skinCss = getSkinCss(event, opt);
+ skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
+ classes = ['fc-event', 'fc-event-skin', 'fc-event-vert', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
+ if (event.source && event.source.className) {
+ classes = classes.concat(event.source.className);
+ }
+
+ s +=
+ "<div class='" + classes.join(' ') + "'" + skinCssAttr + ">" +
+ "<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
+ "<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
+ "<div class='fc-event-time'>" +
+ (times[0] ? '<span class="fc-col-date">' + times[0] + '</span> ' : '') +
+ (times[1] ? '<span class="fc-col-time">' + times[1] + '</span>' : '') +
+ "</div>" +
+ "</div>" +
+ "<div class='fc-event-content'>" +
+ "<div class='fc-event-title'>" +
+ htmlEscape(event.title) +
+ "</div>" +
+ "</div>" +
+ "<div class='fc-event-bg'></div>" +
+ "</div>" + // close inner
+ "</div>"; // close outer
+ }
+
+ segContainer[0].innerHTML = s;
+ eventElements = segContainer.children();
+
+ // retrieve elements, run through eventRender callback, bind event handlers
+ for (i=0; i < seg.events.length; i++) {
+ event = seg.events[i];
+ eventElement = $(eventElements[i]); // faster than eq()
+ triggerRes = trigger('eventRender', event, event, eventElement);
+ if (triggerRes === false) {
+ eventElement.remove();
+ } else {
+ if (triggerRes && triggerRes !== true) {
+ eventElement.remove();
+ eventElement = $(triggerRes).appendTo(segContainer);
+ }
+ if (event._id === modifiedEventId) {
+ eventElementHandlers(event, eventElement, seg);
+ } else {
+ eventElement[0]._fci = i; // for lazySegBind
+ }
+ reportEventElement(event, eventElement);
+ }
+ }
+
+ lazySegBind(segContainer, seg, eventElementHandlers);
+ }
+
+ markFirstLast(getListContainer());
+ }
+
+ // event time/date range to display
+ function renderEventTime(event, seg) {
+ var timeFormat = opt('timeFormat');
+ var dateFormat = opt('columnFormat');
+ var segmode = opt('listSections');
+ var duration = event.end ? event.end.getTime() - event.start.getTime() : 0;
+ var datestr = '', timestr = '';
+
+ if (segmode == 'smart') {
+ if (event.start < seg.start) {
+ datestr = opt('listTexts', 'until') + ' ' + formatDate(event.end, (event.allDay || event.end.getDate() != seg.start.getDate()) ? dateFormat : timeFormat);
+ } else if (duration > DAY_MS) {
+ datestr = formatDates(event.start, event.end, dateFormat + '{ - ' + dateFormat + '}');
+ } else if (seg.daydiff == 0) {
+ datestr = opt('listTexts', 'today');
+ } else if (seg.daydiff == 1) {
+ datestr = opt('listTexts', 'tomorrow');
+ } else if (seg.weekdiff == 0 || seg.weekdiff == 1) {
+ datestr = formatDate(event.start, 'dddd');
+ } else if (seg.daydiff > 1 || seg.daydiff < 0) {
+ datestr = formatDate(event.start, dateFormat);
+ }
+ } else if (segmode != 'day') {
+ datestr = formatDates(event.start, event.end, dateFormat + (duration > DAY_MS ? '{ - ' + dateFormat + '}' : ''));
+ }
+
+ if (!datestr && event.allDay) {
+ timestr = opt('allDayText');
+ } else if ((duration < DAY_MS || !datestr) && !event.allDay) {
+ timestr = formatDates(event.start, event.end, timeFormat);
+ }
+
+ return [datestr, timestr];
+ }
+
+ function lazySegBind(container, seg, bindHandlers) {
+ container.unbind('mouseover').mouseover(function(ev) {
+ var parent = ev.target, e = parent, i, event;
+ while (parent != this) {
+ e = parent;
+ parent = parent.parentNode;
+ }
+ if ((i = e._fci) !== undefined) {
+ e._fci = undefined;
+ event = seg.events[i];
+ bindHandlers(event, container.children().eq(i), seg);
+ $(ev.target).trigger(ev);
+ }
+ ev.stopPropagation();
+ });
+ }
+
}
+;;
+
+/* Additional view: table (by bruederli at kolabsys.com)
+---------------------------------------------------------------------------------*/
+
+fcViews.table = TableView;
+
+
+function TableView(element, calendar) {
+ var t = this;
+
+ // exports
+ t.render = render;
+ t.select = dummy;
+ t.unselect = dummy;
+ t.getDaySegmentContainer = function(){ return table; };
+
+ // imports
+ View.call(t, element, calendar, 'table');
+ TableEventRenderer.call(t);
+ var opt = t.opt;
+ var trigger = t.trigger;
+ var clearEvents = t.clearEvents;
+ var reportEventClear = t.reportEventClear;
+ var formatDates = calendar.formatDates;
+ var formatDate = calendar.formatDate;
+
+ // overrides
+ t.setWidth = setWidth;
+ t.setHeight = setHeight;
+
+ // locals
+ var div;
+ var table;
+ var firstDay;
+ var nwe;
+ var tm;
+ var colFormat;
+
+
+ function render(date, delta) {
+ if (delta) {
+ addDays(date, opt('listPage') * delta);
+ }
+ t.start = t.visStart = cloneDate(date, true);
+ t.end = addDays(cloneDate(t.start), opt('listPage'));
+ t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
+ addMinutes(t.visEnd, -1); // set end to 23:59
+ t.title = (t.visEnd.getTime() - t.visStart.getTime() < DAY_MS) ? formatDate(date, opt('titleFormat')) : formatDates(date, t.visEnd, opt('titleFormat'));
+
+ updateOptions();
+
+ if (!table) {
+ buildSkeleton();
+ } else {
+ clearEvents();
+ }
+ }
+
+
+ function updateOptions() {
+ firstDay = opt('firstDay');
+ nwe = opt('weekends') ? 0 : 1;
+ tm = opt('theme') ? 'ui' : 'fc';
+ colFormat = opt('columnFormat');
+ }
+
+
+ function buildSkeleton() {
+ var tableCols = opt('tableCols');
+ var s =
+ "<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
+ "<colgroup>";
+ for (var c=0; c < tableCols.length; c++) {
+ s += "<col class='fc-event-" + tableCols[c] + "' />";
+ }
+ s += "</colgroup>" +
+ "</table>";
+ div = $('<div>').addClass('fc-list-content').appendTo(element);
+ table = $(s).appendTo(div);
+ }
+
+ function setHeight(height, dateChanged) {
+ if (!opt('listNoHeight'))
+ div.css('height', (height-1)+'px').css('overflow', 'auto');
+ }
+
+ function setWidth(width) {
+ // nothing to be done here
+ }
+
+ function dummy() {
+ // Stub.
+ }
+
+}
+
+;;
+
+/* Additional view renderer: table (by bruederli at kolabsys.com)
+---------------------------------------------------------------------------------*/
+
+function TableEventRenderer() {
+ var t = this;
+
+ // imports
+ ListEventRenderer.call(t);
+ var opt = t.opt;
+ var sortCmp = t.sortCmp;
+ var trigger = t.trigger;
+ var compileSegs = t.compileDaySegs;
+ var reportEventElement = t.reportEventElement;
+ var eventElementHandlers = t.eventElementHandlers;
+ var renderEventTime = t.renderEventTime;
+ var showEvents = t.showEvents;
+ var hideEvents = t.hideEvents;
+ var getListContainer = t.getDaySegmentContainer;
+ var lazySegBind = t.lazySegBind;
+ var calendar = t.calendar;
+ var formatDate = calendar.formatDate;
+ var formatDates = calendar.formatDates;
+
+ // exports
+ t.renderEvents = renderEvents;
+ t.clearEvents = clearEvents;
+
+
+ /* Rendering
+ --------------------------------------------------------------------*/
+
+ function clearEvents() {
+ getListContainer().children('tbody').remove();
+ }
+
+ function renderEvents(events, modifiedEventId) {
+ events.sort(sortCmp);
+ renderSegs(compileSegs(events), modifiedEventId);
+ getListContainer().removeClass('fc-list-smart fc-list-day fc-list-month fc-list-week').addClass('fc-list-' + opt('listSections'));
+ }
+
+ function renderSegs(segs, modifiedEventId) {
+ var tm = opt('theme') ? 'ui' : 'fc';
+ var table = getListContainer();
+ var headerClass = tm + "-widget-header";
+ var contentClass = tm + "-widget-content";
+ var tableCols = opt('tableCols');
+ var timecol = $.inArray('time', tableCols) >= 0;
+ var i, j, seg, event, times, s, skinCss, skinCssAttr, skinClasses, rowClasses, segContainer, eventElements, eventElement, triggerRes;
+
+ for (j=0; j < segs.length; j++) {
+ seg = segs[j];
+
+ if (seg.title) {
+ $('<tbody class="fc-list-header"><tr><td class="fc-list-header ' + headerClass + '" colspan="' + tableCols.length + '">' + htmlEscape(seg.title) + '</td></tr></tbody>').appendTo(table);
+ }
+ segContainer = $('<tbody>').addClass('fc-list-section ' + contentClass).appendTo(table);
+ s = '';
+
+ for (i=0; i < seg.events.length; i++) {
+ event = seg.events[i];
+ times = renderEventTime(event, seg);
+ skinCss = getSkinCss(event, opt);
+ skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
+ skinClasses = ['fc-event-skin', 'fc-corner-left', 'fc-corner-right', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
+ if (event.source && event.source.className) {
+ skinClasses = skinClasses.concat(event.source.className);
+ }
+ rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]];
+ if (seg.daydiff == 0) {
+ rowClasses.push('fc-today');
+ }
+
+ s += "<tr class='" + rowClasses.join(' ') + "'>";
+ for (var col, c=0; c < tableCols.length; c++) {
+ col = tableCols[c];
+ if (col == 'handle') {
+ s += "<td class='fc-event-handle'>" +
+ "<div class='" + skinClasses.join(' ') + "'" + skinCssAttr + ">" +
+ "<span class='fc-event-inner'></span>" +
+ "</div></td>";
+ } else if (col == 'date') {
+ s += "<td class='fc-event-date' colspan='" + (times[1] || !timecol ? 1 : 2) + "'>" + htmlEscape(times[0]) + "</td>";
+ } else if (col == 'time') {
+ if (times[1]) {
+ s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
+ }
+ } else {
+ s += "<td class='fc-event-" + col + "'>" + (event[col] ? htmlEscape(event[col]) : ' ') + "</td>";
+ }
+ }
+ s += "</tr>";
+
+ // IE doesn't like innerHTML on tbody elements so we insert every row individually
+ if (document.all) {
+ $(s).appendTo(segContainer);
+ s = '';
+ }
+ }
+
+ if (!document.all)
+ segContainer[0].innerHTML = s;
+
+ eventElements = segContainer.children();
+
+ // retrieve elements, run through eventRender callback, bind event handlers
+ for (i=0; i < seg.events.length; i++) {
+ event = seg.events[i];
+ eventElement = $(eventElements[i]); // faster than eq()
+ triggerRes = trigger('eventRender', event, event, eventElement);
+ if (triggerRes === false) {
+ eventElement.remove();
+ } else {
+ if (triggerRes && triggerRes !== true) {
+ eventElement.remove();
+ eventElement = $(triggerRes).appendTo(segContainer);
+ }
+ if (event._id === modifiedEventId) {
+ eventElementHandlers(event, eventElement, seg);
+ } else {
+ eventElement[0]._fci = i; // for lazySegBind
+ }
+ reportEventElement(event, eventElement);
+ }
+ }
+
+ lazySegBind(segContainer, seg, eventElementHandlers);
+ markFirstLast(segContainer);
+ }
+
+ //markFirstLast(table);
+ }
+
+}
+;;
function View(element, calendar, viewName) {
@@ -4345,13 +5206,13 @@ function View(element, calendar, viewName) {
t.name = viewName;
t.opt = opt;
t.trigger = trigger;
- //t.setOverflowHidden = setOverflowHidden;
t.isEventDraggable = isEventDraggable;
t.isEventResizable = isEventResizable;
- t.reportEvents = reportEvents;
+ t.setEventData = setEventData;
+ t.clearEventData = clearEventData;
t.eventEnd = eventEnd;
t.reportEventElement = reportEventElement;
- t.reportEventClear = reportEventClear;
+ t.triggerEventDestroy = triggerEventDestroy;
t.eventElementHandlers = eventElementHandlers;
t.showEvents = showEvents;
t.hideEvents = hideEvents;
@@ -4369,16 +5230,16 @@ function View(element, calendar, viewName) {
// locals
- var eventsByID = {};
- var eventElements = [];
- var eventElementsByID = {};
+ var eventsByID = {}; // eventID mapped to array of events (there can be multiple b/c of repeating events)
+ var eventElementsByID = {}; // eventID mapped to array of jQuery elements
+ var eventElementCouples = []; // array of objects, { event, element } // TODO: unify with segment system
var options = calendar.options;
function opt(name, viewNameOverride) {
var v = options[name];
- if (typeof v == 'object' && !v.length) {
+ if ($.isPlainObject(v)) {
return smartProperty(v, viewNameOverride || viewName);
}
return v;
@@ -4392,26 +5253,37 @@ function View(element, calendar, viewName) {
);
}
-
- /*
- function setOverflowHidden(bool) {
- element.css('overflow', bool ? 'hidden' : '');
- }
- */
-
+
+
+ /* Event Editable Boolean Calculations
+ ------------------------------------------------------------------------------*/
+
function isEventDraggable(event) {
- return isEventEditable(event) && !opt('disableDragging');
+ var source = event.source || {};
+ return firstDefined(
+ event.startEditable,
+ source.startEditable,
+ opt('eventStartEditable'),
+ event.editable,
+ source.editable,
+ opt('editable')
+ )
+ && !opt('disableDragging'); // deprecated
}
function isEventResizable(event) { // but also need to make sure the seg.isEnd == true
- return isEventEditable(event) && !opt('disableResizing');
- }
-
-
- function isEventEditable(event) {
- return firstDefined(event.editable, (event.source || {}).editable, opt('editable'));
+ var source = event.source || {};
+ return firstDefined(
+ event.durationEditable,
+ source.durationEditable,
+ opt('eventDurationEditable'),
+ event.editable,
+ source.editable,
+ opt('editable')
+ )
+ && !opt('disableResizing'); // deprecated
}
@@ -4420,8 +5292,7 @@ function View(element, calendar, viewName) {
------------------------------------------------------------------------------*/
- // report when view receives new events
- function reportEvents(events) { // events are already normalized at this point
+ function setEventData(events) { // events are already normalized at this point
eventsByID = {};
var i, len=events.length, event;
for (i=0; i<len; i++) {
@@ -4433,6 +5304,13 @@ function View(element, calendar, viewName) {
}
}
}
+
+
+ function clearEventData() {
+ eventsByID = {};
+ eventElementsByID = {};
+ eventElementCouples = [];
+ }
// returns a Date object for an event's end
@@ -4448,18 +5326,19 @@ function View(element, calendar, viewName) {
// report when view creates an element for an event
function reportEventElement(event, element) {
- eventElements.push(element);
+ eventElementCouples.push({ event: event, element: element });
if (eventElementsByID[event._id]) {
eventElementsByID[event._id].push(element);
}else{
eventElementsByID[event._id] = [element];
}
}
-
-
- function reportEventClear() {
- eventElements = [];
- eventElementsByID = {};
+
+
+ function triggerEventDestroy() {
+ $.each(eventElementCouples, function(i, couple) {
+ t.trigger('eventDestroy', couple.event, couple.event, couple.element);
+ });
}
@@ -4496,6 +5375,8 @@ function View(element, calendar, viewName) {
function eachEventElement(event, exceptElement, funcName) {
+ // NOTE: there may be multiple events per ID (repeating events)
+ // and multiple segments per event
var elements = eventElementsByID[event._id],
i, len = elements.length;
for (i=0; i<len; i++) {
@@ -4584,17 +5465,286 @@ function View(element, calendar, viewName) {
normalizeEvent(e, options);
}
}
+
+
+
+ // ====================================================================================================
+ // Utilities for day "cells"
+ // ====================================================================================================
+ // The "basic" views are completely made up of day cells.
+ // The "agenda" views have day cells at the top "all day" slot.
+ // This was the obvious common place to put these utilities, but they should be abstracted out into
+ // a more meaningful class (like DayEventRenderer).
+ // ====================================================================================================
+
+
+ // For determining how a given "cell" translates into a "date":
+ //
+ // 1. Convert the "cell" (row and column) into a "cell offset" (the # of the cell, cronologically from the first).
+ // Keep in mind that column indices are inverted with isRTL. This is taken into account.
+ //
+ // 2. Convert the "cell offset" to a "day offset" (the # of days since the first visible day in the view).
+ //
+ // 3. Convert the "day offset" into a "date" (a JavaScript Date object).
+ //
+ // The reverse transformation happens when transforming a date into a cell.
+
+
+ // exports
+ t.isHiddenDay = isHiddenDay;
+ t.skipHiddenDays = skipHiddenDays;
+ t.getCellsPerWeek = getCellsPerWeek;
+ t.dateToCell = dateToCell;
+ t.dateToDayOffset = dateToDayOffset;
+ t.dayOffsetToCellOffset = dayOffsetToCellOffset;
+ t.cellOffsetToCell = cellOffsetToCell;
+ t.cellToDate = cellToDate;
+ t.cellToCellOffset = cellToCellOffset;
+ t.cellOffsetToDayOffset = cellOffsetToDayOffset;
+ t.dayOffsetToDate = dayOffsetToDate;
+ t.rangeToSegments = rangeToSegments;
+
+
+ // internals
+ var hiddenDays = opt('hiddenDays') || []; // array of day-of-week indices that are hidden
+ var isHiddenDayHash = []; // is the day-of-week hidden? (hash with day-of-week-index -> bool)
+ var cellsPerWeek;
+ var dayToCellMap = []; // hash from dayIndex -> cellIndex, for one week
+ var cellToDayMap = []; // hash from cellIndex -> dayIndex, for one week
+ var isRTL = opt('isRTL');
+
+
+ // initialize important internal variables
+ (function() {
+
+ if (opt('weekends') === false) {
+ hiddenDays.push(0, 6); // 0=sunday, 6=saturday
+ }
+
+ // Loop through a hypothetical week and determine which
+ // days-of-week are hidden. Record in both hashes (one is the reverse of the other).
+ for (var dayIndex=0, cellIndex=0; dayIndex<7; dayIndex++) {
+ dayToCellMap[dayIndex] = cellIndex;
+ isHiddenDayHash[dayIndex] = $.inArray(dayIndex, hiddenDays) != -1;
+ if (!isHiddenDayHash[dayIndex]) {
+ cellToDayMap[cellIndex] = dayIndex;
+ cellIndex++;
+ }
+ }
+
+ cellsPerWeek = cellIndex;
+ if (!cellsPerWeek) {
+ throw 'invalid hiddenDays'; // all days were hidden? bad.
+ }
+
+ })();
+
+
+ // Is the current day hidden?
+ // `day` is a day-of-week index (0-6), or a Date object
+ function isHiddenDay(day) {
+ if (typeof day == 'object') {
+ day = day.getDay();
+ }
+ return isHiddenDayHash[day];
+ }
+
+
+ function getCellsPerWeek() {
+ return cellsPerWeek;
+ }
+
+
+ // Keep incrementing the current day until it is no longer a hidden day.
+ // If the initial value of `date` is not a hidden day, don't do anything.
+ // Pass `isExclusive` as `true` if you are dealing with an end date.
+ // `inc` defaults to `1` (increment one day forward each time)
+ function skipHiddenDays(date, inc, isExclusive) {
+ inc = inc || 1;
+ while (
+ isHiddenDayHash[ ( date.getDay() + (isExclusive ? inc : 0) + 7 ) % 7 ]
+ ) {
+ addDays(date, inc);
+ }
+ }
+
+
+ //
+ // TRANSFORMATIONS: cell -> cell offset -> day offset -> date
+ //
+
+ // cell -> date (combines all transformations)
+ // Possible arguments:
+ // - row, col
+ // - { row:#, col: # }
+ function cellToDate() {
+ var cellOffset = cellToCellOffset.apply(null, arguments);
+ var dayOffset = cellOffsetToDayOffset(cellOffset);
+ var date = dayOffsetToDate(dayOffset);
+ return date;
+ }
+
+ // cell -> cell offset
+ // Possible arguments:
+ // - row, col
+ // - { row:#, col:# }
+ function cellToCellOffset(row, col) {
+ var colCnt = t.getColCnt();
+
+ // rtl variables. wish we could pre-populate these. but where?
+ var dis = isRTL ? -1 : 1;
+ var dit = isRTL ? colCnt - 1 : 0;
+
+ if (typeof row == 'object') {
+ col = row.col;
+ row = row.row;
+ }
+ var cellOffset = row * colCnt + (col * dis + dit); // column, adjusted for RTL (dis & dit)
+
+ return cellOffset;
+ }
+
+ // cell offset -> day offset
+ function cellOffsetToDayOffset(cellOffset) {
+ var day0 = t.visStart.getDay(); // first date's day of week
+ cellOffset += dayToCellMap[day0]; // normlize cellOffset to beginning-of-week
+ return Math.floor(cellOffset / cellsPerWeek) * 7 // # of days from full weeks
+ + cellToDayMap[ // # of days from partial last week
+ (cellOffset % cellsPerWeek + cellsPerWeek) % cellsPerWeek // crazy math to handle negative cellOffsets
+ ]
+ - day0; // adjustment for beginning-of-week normalization
+ }
+
+ // day offset -> date (JavaScript Date object)
+ function dayOffsetToDate(dayOffset) {
+ var date = cloneDate(t.visStart);
+ addDays(date, dayOffset);
+ return date;
+ }
+
+
+ //
+ // TRANSFORMATIONS: date -> day offset -> cell offset -> cell
+ //
+
+ // date -> cell (combines all transformations)
+ function dateToCell(date) {
+ var dayOffset = dateToDayOffset(date);
+ var cellOffset = dayOffsetToCellOffset(dayOffset);
+ var cell = cellOffsetToCell(cellOffset);
+ return cell;
+ }
+
+ // date -> day offset
+ function dateToDayOffset(date) {
+ return dayDiff(date, t.visStart);
+ }
+
+ // day offset -> cell offset
+ function dayOffsetToCellOffset(dayOffset) {
+ var day0 = t.visStart.getDay(); // first date's day of week
+ dayOffset += day0; // normalize dayOffset to beginning-of-week
+ return Math.floor(dayOffset / 7) * cellsPerWeek // # of cells from full weeks
+ + dayToCellMap[ // # of cells from partial last week
+ (dayOffset % 7 + 7) % 7 // crazy math to handle negative dayOffsets
+ ]
+ - dayToCellMap[day0]; // adjustment for beginning-of-week normalization
+ }
+
+ // cell offset -> cell (object with row & col keys)
+ function cellOffsetToCell(cellOffset) {
+ var colCnt = t.getColCnt();
+
+ // rtl variables. wish we could pre-populate these. but where?
+ var dis = isRTL ? -1 : 1;
+ var dit = isRTL ? colCnt - 1 : 0;
+
+ var row = Math.floor(cellOffset / colCnt);
+ var col = ((cellOffset % colCnt + colCnt) % colCnt) * dis + dit; // column, adjusted for RTL (dis & dit)
+ return {
+ row: row,
+ col: col
+ };
+ }
+
+
+ //
+ // Converts a date range into an array of segment objects.
+ // "Segments" are horizontal stretches of time, sliced up by row.
+ // A segment object has the following properties:
+ // - row
+ // - cols
+ // - isStart
+ // - isEnd
+ //
+ function rangeToSegments(startDate, endDate) {
+ var rowCnt = t.getRowCnt();
+ var colCnt = t.getColCnt();
+ var segments = []; // array of segments to return
+
+ // day offset for given date range
+ var rangeDayOffsetStart = dateToDayOffset(startDate);
+ var rangeDayOffsetEnd = dateToDayOffset(endDate); // exclusive
+
+ // first and last cell offset for the given date range
+ // "last" implies inclusivity
+ var rangeCellOffsetFirst = dayOffsetToCellOffset(rangeDayOffsetStart);
+ var rangeCellOffsetLast = dayOffsetToCellOffset(rangeDayOffsetEnd) - 1;
+
+ // loop through all the rows in the view
+ for (var row=0; row<rowCnt; row++) {
+
+ // first and last cell offset for the row
+ var rowCellOffsetFirst = row * colCnt;
+ var rowCellOffsetLast = rowCellOffsetFirst + colCnt - 1;
+
+ // get the segment's cell offsets by constraining the range's cell offsets to the bounds of the row
+ var segmentCellOffsetFirst = Math.max(rangeCellOffsetFirst, rowCellOffsetFirst);
+ var segmentCellOffsetLast = Math.min(rangeCellOffsetLast, rowCellOffsetLast);
+
+ // make sure segment's offsets are valid and in view
+ if (segmentCellOffsetFirst <= segmentCellOffsetLast) {
+
+ // translate to cells
+ var segmentCellFirst = cellOffsetToCell(segmentCellOffsetFirst);
+ var segmentCellLast = cellOffsetToCell(segmentCellOffsetLast);
+
+ // view might be RTL, so order by leftmost column
+ var cols = [ segmentCellFirst.col, segmentCellLast.col ].sort();
+
+ // Determine if segment's first/last cell is the beginning/end of the date range.
+ // We need to compare "day offset" because "cell offsets" are often ambiguous and
+ // can translate to multiple days, and an edge case reveals itself when we the
+ // range's first cell is hidden (we don't want isStart to be true).
+ var isStart = cellOffsetToDayOffset(segmentCellOffsetFirst) == rangeDayOffsetStart;
+ var isEnd = cellOffsetToDayOffset(segmentCellOffsetLast) + 1 == rangeDayOffsetEnd; // +1 for comparing exclusively
+
+ segments.push({
+ row: row,
+ leftCol: cols[0],
+ rightCol: cols[1],
+ isStart: isStart,
+ isEnd: isEnd
+ });
+ }
+ }
+
+ return segments;
+ }
}
+;;
+
function DayEventRenderer() {
var t = this;
// exports
- t.renderDaySegs = renderDaySegs;
- t.resizableDayEvent = resizableDayEvent;
+ t.renderDayEvents = renderDayEvents;
+ t.draggableDayEvent = draggableDayEvent; // made public so that subclasses can override
+ t.resizableDayEvent = resizableDayEvent; // "
// imports
@@ -4604,428 +5754,657 @@ function DayEventRenderer() {
var isEventResizable = t.isEventResizable;
var eventEnd = t.eventEnd;
var reportEventElement = t.reportEventElement;
+ var eventElementHandlers = t.eventElementHandlers;
var showEvents = t.showEvents;
var hideEvents = t.hideEvents;
+ var eventDrop = t.eventDrop;
var eventResize = t.eventResize;
var getRowCnt = t.getRowCnt;
var getColCnt = t.getColCnt;
var getColWidth = t.getColWidth;
- var allDayRow = t.allDayRow;
- var allDayBounds = t.allDayBounds;
+ var allDayRow = t.allDayRow; // TODO: rename
+ var colLeft = t.colLeft;
+ var colRight = t.colRight;
var colContentLeft = t.colContentLeft;
var colContentRight = t.colContentRight;
- var dayOfWeekCol = t.dayOfWeekCol;
- var dateCell = t.dateCell;
- var compileDaySegs = t.compileDaySegs;
+ var dateToCell = t.dateToCell;
var getDaySegmentContainer = t.getDaySegmentContainer;
- var bindDaySeg = t.bindDaySeg; //TODO: streamline this
var formatDates = t.calendar.formatDates;
var renderDayOverlay = t.renderDayOverlay;
var clearOverlays = t.clearOverlays;
var clearSelection = t.clearSelection;
-
-
-
- /* Rendering
- -----------------------------------------------------------------------------*/
-
-
- function renderDaySegs(segs, modifiedEventId) {
- var segmentContainer = getDaySegmentContainer();
- var rowDivs;
- var rowCnt = getRowCnt();
- var colCnt = getColCnt();
- var i = 0;
- var rowI;
- var levelI;
- var colHeights;
- var j;
- var segCnt = segs.length;
- var seg;
- var top;
- var k;
- var overflows;
- var overflowLinks;
- var maxHeight = opt('maxHeight');
- segmentContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
- daySegElementResolve(segs, segmentContainer.children());
- daySegElementReport(segs);
- daySegHandlers(segs, segmentContainer, modifiedEventId);
- daySegCalcHSides(segs);
- daySegSetWidths(segs);
- daySegCalcHeights(segs);
- rowDivs = getRowDivs();
- // set row heights, calculate event tops (in relation to row top)
- for (rowI=0; rowI<rowCnt; rowI++) {
- levelI = 0;
- overflows = [];
- overflowLinks = {};
- colHeights = [];
- for (j=0; j<colCnt; j++) {
- overflows[j] = 0;
- colHeights[j] = 0;
- }
- while (i<segCnt && (seg = segs[i]).row == rowI) {
- // loop through segs in a row
- top = arrayMax(colHeights.slice(seg.startCol, seg.endCol));
- if (maxHeight && top + seg.outerHeight > maxHeight) {
- seg.overflow = true;
- }
- else {
- seg.top = top;
- top += seg.outerHeight;
- }
- for (k=seg.startCol; k<seg.endCol; k++) {
- 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]++;
- }
- else
- colHeights[k] = top;
- }
- i++;
+ var getHoverListener = t.getHoverListener;
+ var rangeToSegments = t.rangeToSegments;
+ var cellToDate = t.cellToDate;
+ var cellToCellOffset = t.cellToCellOffset;
+ var cellOffsetToDayOffset = t.cellOffsetToDayOffset;
+ var dateToDayOffset = t.dateToDayOffset;
+ var dayOffsetToCellOffset = t.dayOffsetToCellOffset;
+
+
+ // Render `events` onto the calendar, attach mouse event handlers, and call the `eventAfterRender` callback for each.
+ // Mouse event will be lazily applied, except if the event has an ID of `modifiedEventId`.
+ // Can only be called when the event container is empty (because it wipes out all innerHTML).
+ function renderDayEvents(events, modifiedEventId) {
+
+ // do the actual rendering. Receive the intermediate "segment" data structures.
+ var segments = _renderDayEvents(
+ events,
+ false, // don't append event elements
+ true // set the heights of the rows
+ );
+
+ // report the elements to the View, for general drag/resize utilities
+ segmentElementEach(segments, function(segment, element) {
+ reportEventElement(segment.event, element);
+ });
+
+ // attach mouse handlers
+ attachHandlers(segments, modifiedEventId);
+
+ // call `eventAfterRender` callback for each event
+ segmentElementEach(segments, function(segment, element) {
+ trigger('eventAfterRender', segment.event, segment.event, element);
+ });
+ }
+
+
+ // Render an event on the calendar, but don't report them anywhere, and don't attach mouse handlers.
+ // Append this event element to the event container, which might already be populated with events.
+ // If an event's segment will have row equal to `adjustRow`, then explicitly set its top coordinate to `adjustTop`.
+ // This hack is used to maintain continuity when user is manually resizing an event.
+ // Returns an array of DOM elements for the event.
+ function renderTempDayEvent(event, adjustRow, adjustTop) {
+
+ // actually render the event. `true` for appending element to container.
+ // Recieve the intermediate "segment" data structures.
+ var segments = _renderDayEvents(
+ [ event ],
+ true, // append event elements
+ false // don't set the heights of the rows
+ );
+
+ var elements = [];
+
+ // Adjust certain elements' top coordinates
+ segmentElementEach(segments, function(segment, element) {
+ if (segment.row === adjustRow) {
+ element.css('top', adjustTop);
}
- rowDivs[rowI].height(arrayMax(colHeights));
- renderOverflowLinks(overflowLinks, rowDivs[rowI]);
+ elements.push(element[0]); // accumulate DOM nodes
+ });
+
+ return elements;
+ }
+
+
+ // Render events onto the calendar. Only responsible for the VISUAL aspect.
+ // Not responsible for attaching handlers or calling callbacks.
+ // Set `doAppend` to `true` for rendering elements without clearing the existing container.
+ // Set `doRowHeights` to allow setting the height of each row, to compensate for vertical event overflow.
+ function _renderDayEvents(events, doAppend, doRowHeights) {
+
+ // where the DOM nodes will eventually end up
+ var finalContainer = getDaySegmentContainer();
+
+ // the container where the initial HTML will be rendered.
+ // If `doAppend`==true, uses a temporary container.
+ var renderContainer = doAppend ? $("<div/>") : finalContainer;
+
+ var segments = buildSegments(events);
+ var html;
+ var elements;
+
+ // calculate the desired `left` and `width` properties on each segment object
+ calculateHorizontals(segments);
+
+ // build the HTML string. relies on `left` property
+ html = buildHTML(segments);
+
+ // render the HTML. innerHTML is considerably faster than jQuery's .html()
+ renderContainer[0].innerHTML = html;
+
+ // retrieve the individual elements
+ elements = renderContainer.children();
+
+ // if we were appending, and thus using a temporary container,
+ // re-attach elements to the real container.
+ if (doAppend) {
+ finalContainer.append(elements);
}
- daySegSetTops(segs, getRowTops(rowDivs));
+
+ // assigns each element to `segment.event`, after filtering them through user callbacks
+ resolveElements(segments, elements);
+
+ // Calculate the left and right padding+margin for each element.
+ // We need this for setting each element's desired outer width, because of the W3C box model.
+ // It's important we do this in a separate pass from acually setting the width on the DOM elements
+ // because alternating reading/writing dimensions causes reflow for every iteration.
+ segmentElementEach(segments, function(segment, element) {
+ segment.hsides = hsides(element, true); // include margins = `true`
+ });
+
+ // Set the width of each element
+ segmentElementEach(segments, function(segment, element) {
+ element.width(
+ Math.max(0, segment.outerWidth - segment.hsides)
+ );
+ });
+
+ // Grab each element's outerHeight (setVerticals uses this).
+ // To get an accurate reading, it's important to have each element's width explicitly set already.
+ segmentElementEach(segments, function(segment, element) {
+ segment.outerHeight = element.outerHeight(true); // include margins = `true`
+ });
+
+ // Set the top coordinate on each element (requires segment.outerHeight)
+ setVerticals(segments, doRowHeights);
+
+ return segments;
}
-
-
- function renderOverflowLinks(overflowLinks, rowDiv) {
- var container = getDaySegmentContainer();
- var colCnt = getColCnt();
- var element, triggerRes, link;
- for (var j=0; j<colCnt; j++) {
- if ((link = overflowLinks[j])) {
- if (link.count > 1) {
- element = $('<a>').addClass('fc-more-link').html('+'+link.count).appendTo(container);
- element[0].style.position = 'absolute';
- element[0].style.left = link.seg.left + 'px';
- element[0].style.top = (link.top + rowDiv[0].offsetTop) + 'px';
- triggerRes = trigger('overflowRender', link, { count:link.count, date:link.date }, element);
- if (triggerRes === false)
- element.remove();
- }
- else {
- link.seg.top = link.top;
- link.seg.overflow = false;
- }
- }
+
+
+ // Generate an array of "segments" for all events.
+ function buildSegments(events) {
+ var segments = [];
+ for (var i=0; i<events.length; i++) {
+ var eventSegments = buildSegmentsForEvent(events[i]);
+ segments.push.apply(segments, eventSegments); // append an array to an array
}
+ return segments;
}
-
-
- function renderTempDaySegs(segs, adjustRow, adjustTop) {
- var tempContainer = $("<div/>");
- var elements;
- var segmentContainer = getDaySegmentContainer();
- var i;
- var segCnt = segs.length;
- var element;
- tempContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
- elements = tempContainer.children();
- segmentContainer.append(elements);
- daySegElementResolve(segs, elements);
- daySegCalcHSides(segs);
- daySegSetWidths(segs);
- daySegCalcHeights(segs);
- daySegSetTops(segs, getRowTops(getRowDivs()));
- elements = [];
- for (i=0; i<segCnt; i++) {
- element = segs[i].element;
- if (element) {
- if (segs[i].row === adjustRow) {
- element.css('top', adjustTop);
- }
- elements.push(element[0]);
- }
+
+
+ // Generate an array of segments for a single event.
+ // A "segment" is the same data structure that View.rangeToSegments produces,
+ // with the addition of the `event` property being set to reference the original event.
+ function buildSegmentsForEvent(event) {
+ var startDate = event.start;
+ var endDate = exclEndDay(event);
+ var segments = rangeToSegments(startDate, endDate);
+ for (var i=0; i<segments.length; i++) {
+ segments[i].event = event;
}
- return $(elements);
+ return segments;
}
-
-
- function daySegHTML(segs) { // also sets seg.left and seg.outerWidth
- var rtl = opt('isRTL');
- var i;
- var segCnt=segs.length;
- var seg;
- var event;
- var url;
- var classes;
- var bounds = allDayBounds();
- var minLeft = bounds.left;
- var maxLeft = bounds.right;
- var leftCol;
- var rightCol;
- var left;
- var right;
- var skinCss;
+
+
+ // Sets the `left` and `outerWidth` property of each segment.
+ // These values are the desired dimensions for the eventual DOM elements.
+ function calculateHorizontals(segments) {
+ var isRTL = opt('isRTL');
+ for (var i=0; i<segments.length; i++) {
+ var segment = segments[i];
+
+ // Determine functions used for calulating the elements left/right coordinates,
+ // depending on whether the view is RTL or not.
+ // NOTE:
+ // colLeft/colRight returns the coordinate butting up the edge of the cell.
+ // colContentLeft/colContentRight is indented a little bit from the edge.
+ var leftFunc = (isRTL ? segment.isEnd : segment.isStart) ? colContentLeft : colLeft;
+ var rightFunc = (isRTL ? segment.isStart : segment.isEnd) ? colContentRight : colRight;
+
+ var left = leftFunc(segment.leftCol);
+ var right = rightFunc(segment.rightCol);
+ segment.left = left;
+ segment.outerWidth = right - left;
+ }
+ }
+
+
+ // Build a concatenated HTML string for an array of segments
+ function buildHTML(segments) {
var html = '';
- // calculate desired position/dimensions, create html
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- event = seg.event;
- classes = ['fc-event', 'fc-event-skin', 'fc-event-hori'];
- if (isEventDraggable(event)) {
- classes.push('fc-event-draggable');
- }
- if (rtl) {
- if (seg.isStart) {
- classes.push('fc-corner-right');
- }
- if (seg.isEnd) {
- classes.push('fc-corner-left');
- }
- leftCol = dayOfWeekCol(seg.end.getDay()-1);
- rightCol = dayOfWeekCol(seg.start.getDay());
- left = seg.isEnd ? colContentLeft(leftCol) : minLeft;
- right = seg.isStart ? colContentRight(rightCol) : maxLeft;
- }else{
- if (seg.isStart) {
- classes.push('fc-corner-left');
- }
- if (seg.isEnd) {
- classes.push('fc-corner-right');
- }
- leftCol = dayOfWeekCol(seg.start.getDay());
- rightCol = dayOfWeekCol(seg.end.getDay()-1);
- left = seg.isStart ? colContentLeft(leftCol) : minLeft;
- right = seg.isEnd ? colContentRight(rightCol) : maxLeft;
- }
- classes = classes.concat(event.className);
- if (event.source) {
- classes = classes.concat(event.source.className || []);
- }
- url = event.url;
- skinCss = getSkinCss(event, opt);
- if (url) {
- html += "<a href='" + htmlEscape(url) + "'";
- }else{
- html += "<div";
- }
+ for (var i=0; i<segments.length; i++) {
+ html += buildHTMLForSegment(segments[i]);
+ }
+ return html;
+ }
+
+
+ // Build an HTML string for a single segment.
+ // Relies on the following properties:
+ // - `segment.event` (from `buildSegmentsForEvent`)
+ // - `segment.left` (from `calculateHorizontals`)
+ function buildHTMLForSegment(segment) {
+ var html = '';
+ var isRTL = opt('isRTL');
+ var event = segment.event;
+ var url = event.url;
+
+ // generate the list of CSS classNames
+ var classNames = [ 'fc-event', 'fc-event-skin', 'fc-event-hori' ];
+ if (isEventDraggable(event)) {
+ classNames.push('fc-event-draggable');
+ }
+ if (segment.isStart) {
+ classNames.push('fc-event-start');
+ }
+ if (segment.isEnd) {
+ classNames.push('fc-event-end');
+ }
+ // use the event's configured classNames
+ // guaranteed to be an array via `normalizeEvent`
+ classNames = classNames.concat(event.className);
+ if (event.source) {
+ // use the event's source's classNames, if specified
+ classNames = classNames.concat(event.source.className || []);
+ }
+
+ // generate a semicolon delimited CSS string for any of the "skin" properties
+ // of the event object (`backgroundColor`, `borderColor` and such)
+ var skinCss = getSkinCss(event, opt);
+
+ if (url) {
+ html += "<a href='" + htmlEscape(url) + "'";
+ }else{
+ html += "<div";
+ }
+ html +=
+ " class='" + classNames.join(' ') + "'" +
+ " style=" +
+ "'" +
+ "position:absolute;" +
+ "left:" + segment.left + "px;" +
+ skinCss +
+ "'" +
+ ">" +
+ "<div class='fc-event-inner'>";
+ if (!event.allDay && segment.isStart) {
html +=
- " class='" + classes.join(' ') + "'" +
- " style='position:absolute;z-index:8;left:"+left+"px;" + skinCss + "'" +
- ">" +
- "<div" +
- " class='fc-event-inner fc-event-skin'" +
- (skinCss ? " style='" + skinCss + "'" : '') +
- ">";
- if (!event.allDay && seg.isStart) {
- html +=
- "<span class='fc-event-time'>" +
- htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
- "</span>";
- }
+ "<span class='fc-event-time'>" +
+ htmlEscape(
+ formatDates(event.start, event.end, opt('timeFormat'))
+ ) +
+ "</span>";
+ }
+ html +=
+ "<span class='fc-event-title'>" +
+ htmlEscape(event.title || '') +
+ "</span>" +
+ "</div>";
+ if (segment.isEnd && isEventResizable(event)) {
html +=
- "<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
+ "<div class='ui-resizable-handle ui-resizable-" + (isRTL ? 'w' : 'e') + "'>" +
+ " " + // makes hit area a lot better for IE6/7
"</div>";
- if (seg.isEnd && isEventResizable(event)) {
- html +=
- "<div class='ui-resizable-handle ui-resizable-" + (rtl ? 'w' : 'e') + "'>" +
- " " + // makes hit area a lot better for IE6/7
- "</div>";
- }
- html +=
- "</" + (url ? "a" : "div" ) + ">";
- seg.left = left;
- seg.outerWidth = right - left;
- seg.startCol = leftCol;
- seg.endCol = rightCol + 1; // needs to be exclusive
}
+ html += "</" + (url ? "a" : "div") + ">";
+
+ // TODO:
+ // When these elements are initially rendered, they will be briefly visibile on the screen,
+ // even though their widths/heights are not set.
+ // SOLUTION: initially set them as visibility:hidden ?
+
return html;
}
-
-
- function daySegElementResolve(segs, elements) { // sets seg.element
- var i;
- var segCnt = segs.length;
- var seg;
- var event;
- var element;
- var triggerRes;
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- event = seg.event;
- element = $(elements[i]); // faster than .eq()
- triggerRes = trigger('eventRender', event, event, element);
+
+
+ // Associate each segment (an object) with an element (a jQuery object),
+ // by setting each `segment.element`.
+ // Run each element through the `eventRender` filter, which allows developers to
+ // modify an existing element, supply a new one, or cancel rendering.
+ function resolveElements(segments, elements) {
+ for (var i=0; i<segments.length; i++) {
+ var segment = segments[i];
+ var event = segment.event;
+ var element = elements.eq(i);
+
+ // call the trigger with the original element
+ var triggerRes = trigger('eventRender', event, event, element);
+
if (triggerRes === false) {
+ // if `false`, remove the event from the DOM and don't assign it to `segment.event`
element.remove();
- }else{
+ }
+ else {
if (triggerRes && triggerRes !== true) {
+ // the trigger returned a new element, but not `true` (which means keep the existing element)
+
+ // re-assign the important CSS dimension properties that were already assigned in `buildHTMLForSegment`
triggerRes = $(triggerRes)
.css({
position: 'absolute',
- left: seg.left
+ left: segment.left
});
+
element.replaceWith(triggerRes);
element = triggerRes;
}
- seg.element = element;
+
+ segment.element = element;
}
}
}
-
-
- function daySegElementReport(segs) {
- var i;
- var segCnt = segs.length;
- var seg;
- var element;
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- element = seg.element;
- if (element) {
- reportEventElement(seg.event, element);
+
+
+
+ /* Top-coordinate Methods
+ -------------------------------------------------------------------------------------------------*/
+
+
+ // Sets the "top" CSS property for each element.
+ // If `doRowHeights` is `true`, also sets each row's first cell to an explicit height,
+ // so that if elements vertically overflow, the cell expands vertically to compensate.
+ function setVerticals(segments, doRowHeights) {
+ var overflowLinks = {};
+ var rowContentHeights = calculateVerticals(segments, overflowLinks); // also sets segment.top
+ var rowContentElements = getRowContentElements(); // returns 1 inner div per row
+ var rowContentTops = [];
+
+ // Set each row's height by setting height of first inner div
+ if (doRowHeights) {
+ for (var i=0; i<rowContentElements.length; i++) {
+ rowContentElements[i].height(rowContentHeights[i]);
+ if (overflowLinks[i])
+ renderOverflowLinks(overflowLinks[i], rowContentElements[i]);
}
}
+
+ // Get each row's top, relative to the views's origin.
+ // Important to do this after setting each row's height.
+ for (var i=0; i<rowContentElements.length; i++) {
+ rowContentTops.push(
+ rowContentElements[i].position().top
+ );
+ }
+
+ // Set each segment element's CSS "top" property.
+ // Each segment object has a "top" property, which is relative to the row's top, but...
+ segmentElementEach(segments, function(segment, element) {
+ if (!segment.overflow) {
+ element.css(
+ 'top',
+ rowContentTops[segment.row] + segment.top // ...now, relative to views's origin
+ );
+ }
+ else {
+ element.hide();
+ }
+ });
}
-
-
- function daySegHandlers(segs, segmentContainer, modifiedEventId) {
- var i;
- var segCnt = segs.length;
- var seg;
- var element;
- var event;
- // retrieve elements, run through eventRender callback, bind handlers
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- element = seg.element;
- if (element) {
- event = seg.event;
- if (event._id === modifiedEventId) {
- bindDaySeg(event, element, seg);
- }else{
- element[0]._fci = i; // for lazySegBind
+
+
+ // Calculate the "top" coordinate for each segment, relative to the "top" of the row.
+ // Also, return an array that contains the "content" height for each row
+ // (the height displaced by the vertically stacked events in the row).
+ // Requires segments to have their `outerHeight` property already set.
+ function calculateVerticals(segments, overflowLinks) {
+ var rowCnt = getRowCnt();
+ var colCnt = getColCnt();
+ var rowContentHeights = []; // content height for each row
+ var segmentRows = buildSegmentRows(segments); // an array of segment arrays, one for each row
+ var maxHeight = opt('maxHeight');
+ var top;
+
+ for (var rowI=0; rowI<rowCnt; rowI++) {
+ var segmentRow = segmentRows[rowI];
+
+ // an array of running total heights for each column.
+ // initialize with all zeros.
+ overflowLinks[rowI] = {};
+ var colHeights = [];
+ var overflows = [];
+ for (var colI=0; colI<colCnt; colI++) {
+ colHeights.push(0);
+ overflows.push(0);
+ }
+
+ // loop through every segment
+ for (var segmentI=0; segmentI<segmentRow.length; segmentI++) {
+ var segment = segmentRow[segmentI];
+
+ // find the segment's top coordinate by looking at the max height
+ // of all the columns the segment will be in.
+ top = arrayMax(
+ colHeights.slice(
+ segment.leftCol,
+ segment.rightCol + 1 // make exclusive for slice
+ )
+ );
+
+ if (maxHeight && top + segment.outerHeight > maxHeight) {
+ segment.overflow = true;
+ }
+ else {
+ segment.top = top;
+ top += segment.outerHeight;
+ }
+
+ // adjust the columns to account for the segment's height
+ for (var colI=segment.leftCol; colI<=segment.rightCol; colI++) {
+ if (overflows[colI]) {
+ segment.overflow = true;
+ }
+ if (segment.overflow) {
+ if (segment.isStart && !overflowLinks[rowI][colI])
+ overflowLinks[rowI][colI] = { seg:segment, top:top, date:cloneDate(segment.event.start, true), count:0 };
+ if (overflowLinks[rowI][colI])
+ overflowLinks[rowI][colI].count++;
+ overflows[colI]++;
+ }
+ else {
+ colHeights[colI] = top;
+ }
}
}
+
+ // the tallest column in the row should be the "content height"
+ rowContentHeights.push(arrayMax(colHeights));
}
- lazySegBind(segmentContainer, segs, bindDaySeg);
+
+ return rowContentHeights;
}
-
-
- function daySegCalcHSides(segs) { // also sets seg.key
- var i;
- var segCnt = segs.length;
- var seg;
- var element;
- var key, val;
- var hsideCache = {};
- // record event horizontal sides
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- element = seg.element;
- if (element) {
- key = seg.key = cssKey(element[0]);
- val = hsideCache[key];
- if (val === undefined) {
- val = hsideCache[key] = hsides(element, true);
+
+
+ // Build an array of segment arrays, each representing the segments that will
+ // be in a row of the grid, sorted by which event should be closest to the top.
+ function buildSegmentRows(segments) {
+ var rowCnt = getRowCnt();
+ var segmentRows = [];
+ var segmentI;
+ var segment;
+ var rowI;
+
+ // group segments by row
+ for (segmentI=0; segmentI<segments.length; segmentI++) {
+ segment = segments[segmentI];
+ rowI = segment.row;
+ if (segment.element) { // was rendered?
+ if (segmentRows[rowI]) {
+ // already other segments. append to array
+ segmentRows[rowI].push(segment);
+ }
+ else {
+ // first segment in row. create new array
+ segmentRows[rowI] = [ segment ];
}
- seg.hsides = val;
}
}
+
+ // sort each row
+ for (rowI=0; rowI<rowCnt; rowI++) {
+ segmentRows[rowI] = sortSegmentRow(
+ segmentRows[rowI] || [] // guarantee an array, even if no segments
+ );
+ }
+
+ return segmentRows;
}
-
-
- function daySegSetWidths(segs) {
- var i;
- var segCnt = segs.length;
- var seg;
- var element;
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- element = seg.element;
- if (element) {
- element[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
- }
+
+
+ // Sort an array of segments according to which segment should appear closest to the top
+ function sortSegmentRow(segments) {
+ var sortedSegments = [];
+
+ // build the subrow array
+ var subrows = buildSegmentSubrows(segments);
+
+ // flatten it
+ for (var i=0; i<subrows.length; i++) {
+ sortedSegments.push.apply(sortedSegments, subrows[i]); // append an array to an array
}
+
+ return sortedSegments;
}
-
-
- function daySegCalcHeights(segs) {
- var i;
- var segCnt = segs.length;
- var seg;
- var element;
- var key, val;
- var vmarginCache = {};
- // record event heights
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- element = seg.element;
- if (element) {
- key = seg.key; // created in daySegCalcHSides
- val = vmarginCache[key];
- if (val === undefined) {
- val = vmarginCache[key] = vmargins(element);
+
+
+ // Take an array of segments, which are all assumed to be in the same row,
+ // and sort into subrows.
+ function buildSegmentSubrows(segments) {
+
+ // Give preference to elements with certain criteria, so they have
+ // a chance to be closer to the top.
+ segments.sort(compareDaySegments);
+
+ var subrows = [];
+ for (var i=0; i<segments.length; i++) {
+ var segment = segments[i];
+
+ // loop through subrows, starting with the topmost, until the segment
+ // doesn't collide with other segments.
+ for (var j=0; j<subrows.length; j++) {
+ if (!isDaySegmentCollision(segment, subrows[j])) {
+ break;
}
- seg.outerHeight = element[0].offsetHeight + val;
}
- else // always set a value (issue #1108 )
- seg.outerHeight = 0;
+ // `j` now holds the desired subrow index
+ if (subrows[j]) {
+ subrows[j].push(segment);
+ }
+ else {
+ subrows[j] = [ segment ];
+ }
}
+
+ return subrows;
}
-
-
- function getRowDivs() {
+
+
+ // Return an array of jQuery objects for the placeholder content containers of each row.
+ // The content containers don't actually contain anything, but their dimensions should match
+ // the events that are overlaid on top.
+ function getRowContentElements() {
var i;
var rowCnt = getRowCnt();
var rowDivs = [];
for (i=0; i<rowCnt; i++) {
rowDivs[i] = allDayRow(i)
- .find('td:first div.fc-day-content > div'); // optimal selector?
+ .find('div.fc-day-content > div');
}
return rowDivs;
}
-
-
- function getRowTops(rowDivs) {
- var i;
- var rowCnt = rowDivs.length;
- var tops = [];
- for (i=0; i<rowCnt; i++) {
- tops[i] = rowDivs[i][0].offsetTop; // !!?? but this means the element needs position:relative if in a table cell!!!!
+
+
+ function renderOverflowLinks(overflowLinks, rowDiv) {
+ var container = getDaySegmentContainer();
+ var colCnt = getColCnt();
+ var element, triggerRes, link;
+ for (var j=0; j<colCnt; j++) {
+ if ((link = overflowLinks[j])) {
+ if (link.count > 1) {
+ element = $('<a>').addClass('fc-more-link').html('+'+link.count).appendTo(container);
+ element[0].style.position = 'absolute';
+ element[0].style.left = link.seg.left + 'px';
+ element[0].style.top = (link.top + rowDiv[0].offsetTop) + 'px';
+ triggerRes = trigger('overflowRender', link, { count:link.count, date:link.date }, element);
+ if (triggerRes === false)
+ element.remove();
+ }
+ else {
+ link.seg.top = link.top;
+ link.seg.overflow = false;
+ }
+ }
}
- return tops;
}
-
-
- function daySegSetTops(segs, rowTops) { // also triggers eventAfterRender
- var i;
- var segCnt = segs.length;
- var seg;
- var element;
- var event;
- for (i=0; i<segCnt; i++) {
- seg = segs[i];
- element = seg.element;
- if (element && !seg.overflow) {
- element[0].style.top = rowTops[seg.row] + (seg.top||0) + 'px';
- event = seg.event;
- trigger('eventAfterRender', event, event, element);
+
+
+ /* Mouse Handlers
+ ---------------------------------------------------------------------------------------------------*/
+ // TODO: better documentation!
+
+
+ function attachHandlers(segments, modifiedEventId) {
+ var segmentContainer = getDaySegmentContainer();
+
+ segmentElementEach(segments, function(segment, element, i) {
+ var event = segment.event;
+ if (event._id === modifiedEventId) {
+ bindDaySeg(event, element, segment);
+ }else{
+ element[0]._fci = i; // for lazySegBind
}
- else if (element)
- element.hide();
+ });
+
+ lazySegBind(segmentContainer, segments, bindDaySeg);
+ }
+
+
+ function bindDaySeg(event, eventElement, segment) {
+
+ if (isEventDraggable(event)) {
+ t.draggableDayEvent(event, eventElement, segment); // use `t` so subclasses can override
+ }
+
+ if (
+ segment.isEnd && // only allow resizing on the final segment for an event
+ isEventResizable(event)
+ ) {
+ t.resizableDayEvent(event, eventElement, segment); // use `t` so subclasses can override
}
+
+ // attach all other handlers.
+ // needs to be after, because resizableDayEvent might stopImmediatePropagation on click
+ eventElementHandlers(event, eventElement);
}
+
+ function draggableDayEvent(event, eventElement) {
+ var hoverListener = getHoverListener();
+ var dayDelta;
+ eventElement.draggable({
+ delay: 50,
+ opacity: opt('dragOpacity'),
+ revertDuration: opt('dragRevertDuration'),
+ start: function(ev, ui) {
+ trigger('eventDragStart', eventElement, event, ev, ui);
+ hideEvents(event, eventElement);
+ hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+ eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
+ clearOverlays();
+ if (cell) {
+ var origDate = cellToDate(origCell);
+ var date = cellToDate(cell);
+ dayDelta = dayDiff(date, origDate);
+ renderDayOverlay(
+ addDays(cloneDate(event.start), dayDelta),
+ addDays(exclEndDay(event), dayDelta)
+ );
+ }else{
+ dayDelta = 0;
+ }
+ }, ev, 'drag');
+ },
+ stop: function(ev, ui) {
+ hoverListener.stop();
+ clearOverlays();
+ trigger('eventDragStop', eventElement, event, ev, ui);
+ if (dayDelta) {
+ eventDrop(this, event, dayDelta, 0, event.allDay, ev, ui);
+ }else{
+ eventElement.css('filter', ''); // clear IE opacity side-effects
+ showEvents(event, eventElement);
+ }
+ }
+ });
+ }
+
-
- /* Resizing
- -----------------------------------------------------------------------------------*/
-
-
- function resizableDayEvent(event, element, seg) {
- var rtl = opt('isRTL');
- var direction = rtl ? 'w' : 'e';
- var handle = element.find('div.ui-resizable-' + direction);
+ function resizableDayEvent(event, element, segment) {
+ var isRTL = opt('isRTL');
+ var direction = isRTL ? 'w' : 'e';
+ var handle = element.find('.ui-resizable-' + direction); // TODO: stop using this class because we aren't using jqui for this
var isResizing = false;
// TODO: look into using jquery-ui mouse widget for this stuff
@@ -5047,16 +6426,14 @@ function DayEventRenderer() {
return; // needs to be left mouse button
}
isResizing = true;
- var hoverListener = t.getHoverListener();
+ var hoverListener = getHoverListener();
var rowCnt = getRowCnt();
var colCnt = getColCnt();
- var dis = rtl ? -1 : 1;
- var dit = rtl ? colCnt-1 : 0;
var elementTop = element.css('top');
var dayDelta;
var helpers;
var eventCopy = $.extend({}, event);
- var minCell = dateCell(event.start);
+ var minCellOffset = dayOffsetToCellOffset( dateToDayOffset(event.start) );
clearSelection();
$('body')
.css('cursor', direction + '-resize')
@@ -5064,30 +6441,32 @@ function DayEventRenderer() {
trigger('eventResizeStart', this, event, ev);
hoverListener.start(function(cell, origCell) {
if (cell) {
- var r = Math.max(minCell.row, cell.row);
- var c = cell.col;
- if (rowCnt == 1) {
- r = 0; // hack for all-day area in agenda views
- }
- if (r == minCell.row) {
- if (rtl) {
- c = Math.min(minCell.col, c);
- }else{
- c = Math.max(minCell.col, c);
- }
- }
- dayDelta = (r*7 + c*dis+dit) - (origCell.row*7 + origCell.col*dis+dit);
- var newEnd = addDays(eventEnd(event), dayDelta, true);
+
+ var origCellOffset = cellToCellOffset(origCell);
+ var cellOffset = cellToCellOffset(cell);
+
+ // don't let resizing move earlier than start date cell
+ cellOffset = Math.max(cellOffset, minCellOffset);
+
+ dayDelta =
+ cellOffsetToDayOffset(cellOffset) -
+ cellOffsetToDayOffset(origCellOffset);
+
if (dayDelta) {
- eventCopy.end = newEnd;
+ eventCopy.end = addDays(eventEnd(event), dayDelta, true);
var oldHelpers = helpers;
- helpers = renderTempDaySegs(compileDaySegs([eventCopy]), seg.row, elementTop);
+
+ helpers = renderTempDayEvent(eventCopy, segment.row, elementTop);
+ helpers = $(helpers); // turn array into a jQuery object
+
helpers.find('*').css('cursor', direction + '-resize');
if (oldHelpers) {
oldHelpers.remove();
}
+
hideEvents(event);
- }else{
+ }
+ else {
if (helpers) {
showEvents(event);
helpers.remove();
@@ -5095,7 +6474,12 @@ function DayEventRenderer() {
}
}
clearOverlays();
- renderDayOverlay(event.start, addDays(cloneDate(newEnd), 1)); // coordinate grid already rebuild at hoverListener.start
+ renderDayOverlay( // coordinate grid already rebuilt with hoverListener.start()
+ event.start,
+ addDays( exclEndDay(event), dayDelta )
+ // TODO: instead of calling renderDayOverlay() with dates,
+ // call _renderDayOverlay (or whatever) with cell offsets.
+ );
}
}, ev);
@@ -5114,13 +6498,54 @@ function DayEventRenderer() {
isResizing = false;
},0);
}
-
});
}
}
+
+
+/* Generalized Segment Utilities
+-------------------------------------------------------------------------------------------------*/
+
+
+function isDaySegmentCollision(segment, otherSegments) {
+ for (var i=0; i<otherSegments.length; i++) {
+ var otherSegment = otherSegments[i];
+ if (
+ otherSegment.leftCol <= segment.rightCol &&
+ otherSegment.rightCol >= segment.leftCol
+ ) {
+ return true;
+ }
+ }
+ return false;
+}
+
+
+function segmentElementEach(segments, callback) { // TODO: use in AgendaView?
+ for (var i=0; i<segments.length; i++) {
+ var segment = segments[i];
+ var element = segment.element;
+ if (element) {
+ callback(segment, element, i);
+ }
+ }
+}
+
+
+// A cmp function for determining which segments should appear higher up
+function compareDaySegments(a, b) {
+ return (b.rightCol - b.leftCol) - (a.rightCol - a.leftCol) || // put wider events first
+ b.event.allDay - a.event.allDay || // if tie, put all-day events first (booleans cast to 0/1)
+ a.event.start - b.event.start || // if a tie, sort by event start date
+ (a.event.title || '').localeCompare(b.event.title) // if a tie, sort by event title
+}
+
+
+;;
+
//BUG: unselect needs to be triggered when events are dragged+dropped
function SelectionManager() {
@@ -5187,18 +6612,18 @@ function SelectionManager() {
function daySelectionMousedown(ev) { // not really a generic manager method, oh well
- var cellDate = t.cellDate;
- var cellIsAllDay = t.cellIsAllDay;
+ var cellToDate = t.cellToDate;
+ var getIsCellAllDay = t.getIsCellAllDay;
var hoverListener = t.getHoverListener();
var reportDayClick = t.reportDayClick; // this is hacky and sort of weird
if (ev.which == 1 && opt('selectable')) { // which==1 means left mouse button
unselect(ev);
var _mousedownElement = this;
var dates;
- hoverListener.start(function(cell, origCell) { // TODO: maybe put cellDate/cellIsAllDay info in cell
+ hoverListener.start(function(cell, origCell) { // TODO: maybe put cellToDate/getIsCellAllDay info in cell
clearSelection();
- if (cell && cellIsAllDay(cell)) {
- dates = [ cellDate(origCell), cellDate(cell) ].sort(cmp);
+ if (cell && getIsCellAllDay(cell)) {
+ dates = [ cellToDate(origCell), cellToDate(cell) ].sort(dateCompare);
renderSelection(dates[0], dates[1], true);
}else{
dates = null;
@@ -5218,6 +6643,8 @@ function SelectionManager() {
}
+
+;;
function OverlayManager() {
var t = this;
@@ -5256,6 +6683,8 @@ function OverlayManager() {
}
+;;
+
function CoordinateGrid(buildFunc) {
var t = this;
@@ -5302,6 +6731,8 @@ function CoordinateGrid(buildFunc) {
}
+;;
+
function HoverListener(coordinateGrid) {
@@ -5360,6 +6791,8 @@ function _fixUIEvent(event) { // for issue 1168
event.pageY = event.originalEvent.pageY;
}
}
+;;
+
function HorizontalPositionCache(getElement) {
var t = this,
@@ -5387,559 +6820,6 @@ function HorizontalPositionCache(getElement) {
}
-/* Additional view: list (by bruederli at kolabsys.com)
----------------------------------------------------------------------------------*/
-
-function ListEventRenderer() {
- var t = this;
-
- // exports
- t.renderEvents = renderEvents;
- t.renderEventTime = renderEventTime;
- t.compileDaySegs = compileSegs; // for DayEventRenderer
- t.clearEvents = clearEvents;
- t.lazySegBind = lazySegBind;
- t.sortCmp = sortCmp;
-
- // imports
- DayEventRenderer.call(t);
- var opt = t.opt;
- var trigger = t.trigger;
- var reportEvents = t.reportEvents;
- var reportEventClear = t.reportEventClear;
- var reportEventElement = t.reportEventElement;
- var eventElementHandlers = t.eventElementHandlers;
- var showEvents = t.showEvents;
- var hideEvents = t.hideEvents;
- var getListContainer = t.getDaySegmentContainer;
- var calendar = t.calendar;
- var formatDate = calendar.formatDate;
- var formatDates = calendar.formatDates;
-
-
- /* Rendering
- --------------------------------------------------------------------*/
-
- function clearEvents() {
- reportEventClear();
- getListContainer().empty();
- }
-
- function renderEvents(events, modifiedEventId) {
- events.sort(sortCmp);
- reportEvents(events);
- renderSegs(compileSegs(events), modifiedEventId);
- }
-
- function compileSegs(events) {
- var segs = [];
- var colFormat = opt('titleFormat', 'day');
- var firstDay = opt('firstDay');
- var segmode = opt('listSections');
- var event, i, dd, wd, md, seg, segHash, curSegHash, segDate, curSeg = -1;
- var today = clearTime(new Date());
- var weekstart = addDays(cloneDate(today), -((today.getDay() - firstDay + 7) % 7));
-
- for (i=0; i < events.length; i++) {
- event = events[i];
-
- // skip events out of range
- if ((event.end || event.start) < t.start || event.start > t.visEnd)
- continue;
-
- // define sections of this event
- // create smart sections such as today, tomorrow, this week, next week, next month, ect.
- segDate = cloneDate(event.start < t.start && event.end > t.start ? t.start : event.start, true);
- dd = dayDiff(segDate, today);
- wd = Math.floor(dayDiff(segDate, weekstart) / 7);
- md = segDate.getMonth() + ((segDate.getYear() - today.getYear()) * 12) - today.getMonth();
-
- // build section title
- if (segmode == 'smart') {
- if (dd < 0) {
- segHash = opt('listTexts', 'past');
- } else if (dd == 0) {
- segHash = opt('listTexts', 'today');
- } else if (dd == 1) {
- segHash = opt('listTexts', 'tomorrow');
- } else if (wd == 0) {
- segHash = opt('listTexts', 'thisWeek');
- } else if (wd == 1) {
- segHash = opt('listTexts', 'nextWeek');
- } else if (md == 0) {
- segHash = opt('listTexts', 'thisMonth');
- } else if (md == 1) {
- segHash = opt('listTexts', 'nextMonth');
- } else if (md > 1) {
- segHash = opt('listTexts', 'future');
- }
- } else if (segmode == 'month') {
- segHash = formatDate(segDate, 'MMMM yyyy');
- } else if (segmode == 'week') {
- segHash = opt('listTexts', 'week') + formatDate(segDate, ' W');
- } else if (segmode == 'day') {
- segHash = formatDate(segDate, colFormat);
- } else {
- segHash = '';
- }
-
- // start new segment
- if (segHash != curSegHash) {
- segs[++curSeg] = { events: [], start: segDate, title: segHash, daydiff: dd, weekdiff: wd, monthdiff: md };
- curSegHash = segHash;
- }
-
- segs[curSeg].events.push(event);
- }
-
- return segs;
- }
-
- function sortCmp(a, b) {
- var sd = a.start.getTime() - b.start.getTime();
- return sd || (a.end ? a.end.getTime() : 0) - (b.end ? b.end.getTime() : 0);
- }
-
- function renderSegs(segs, modifiedEventId) {
- var tm = opt('theme') ? 'ui' : 'fc';
- var headerClass = tm + "-widget-header";
- var contentClass = tm + "-widget-content";
- var i, j, seg, event, times, s, skinCss, skinCssAttr, classes, segContainer, eventElement, eventElements, triggerRes;
-
- for (j=0; j < segs.length; j++) {
- seg = segs[j];
-
- if (seg.title) {
- $('<div class="fc-list-header ' + headerClass + '">' + htmlEscape(seg.title) + '</div>').appendTo(getListContainer());
- }
- segContainer = $('<div>').addClass('fc-list-section ' + contentClass).appendTo(getListContainer());
- s = '';
-
- for (i=0; i < seg.events.length; i++) {
- event = seg.events[i];
- times = renderEventTime(event, seg);
- skinCss = getSkinCss(event, opt);
- skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
- classes = ['fc-event', 'fc-event-skin', 'fc-event-vert', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
- if (event.source && event.source.className) {
- classes = classes.concat(event.source.className);
- }
-
- s +=
- "<div class='" + classes.join(' ') + "'" + skinCssAttr + ">" +
- "<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
- "<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
- "<div class='fc-event-time'>" +
- (times[0] ? '<span class="fc-col-date">' + times[0] + '</span> ' : '') +
- (times[1] ? '<span class="fc-col-time">' + times[1] + '</span>' : '') +
- "</div>" +
- "</div>" +
- "<div class='fc-event-content'>" +
- "<div class='fc-event-title'>" +
- htmlEscape(event.title) +
- "</div>" +
- "</div>" +
- "<div class='fc-event-bg'></div>" +
- "</div>" + // close inner
- "</div>"; // close outer
- }
-
- segContainer[0].innerHTML = s;
- eventElements = segContainer.children();
-
- // retrieve elements, run through eventRender callback, bind event handlers
- for (i=0; i < seg.events.length; i++) {
- event = seg.events[i];
- eventElement = $(eventElements[i]); // faster than eq()
- triggerRes = trigger('eventRender', event, event, eventElement);
- if (triggerRes === false) {
- eventElement.remove();
- } else {
- if (triggerRes && triggerRes !== true) {
- eventElement.remove();
- eventElement = $(triggerRes).appendTo(segContainer);
- }
- if (event._id === modifiedEventId) {
- eventElementHandlers(event, eventElement, seg);
- } else {
- eventElement[0]._fci = i; // for lazySegBind
- }
- reportEventElement(event, eventElement);
- }
- }
-
- lazySegBind(segContainer, seg, eventElementHandlers);
- }
-
- markFirstLast(getListContainer());
- }
-
- // event time/date range to display
- function renderEventTime(event, seg) {
- var timeFormat = opt('timeFormat');
- var dateFormat = opt('columnFormat');
- var segmode = opt('listSections');
- var duration = event.end ? event.end.getTime() - event.start.getTime() : 0;
- var datestr = '', timestr = '';
-
- if (segmode == 'smart') {
- if (event.start < seg.start) {
- datestr = opt('listTexts', 'until') + ' ' + formatDate(event.end, (event.allDay || event.end.getDate() != seg.start.getDate()) ? dateFormat : timeFormat);
- } else if (duration > DAY_MS) {
- datestr = formatDates(event.start, event.end, dateFormat + '{ - ' + dateFormat + '}');
- } else if (seg.daydiff == 0) {
- datestr = opt('listTexts', 'today');
- } else if (seg.daydiff == 1) {
- datestr = opt('listTexts', 'tomorrow');
- } else if (seg.weekdiff == 0 || seg.weekdiff == 1) {
- datestr = formatDate(event.start, 'dddd');
- } else if (seg.daydiff > 1 || seg.daydiff < 0) {
- datestr = formatDate(event.start, dateFormat);
- }
- } else if (segmode != 'day') {
- datestr = formatDates(event.start, event.end, dateFormat + (duration > DAY_MS ? '{ - ' + dateFormat + '}' : ''));
- }
-
- if (!datestr && event.allDay) {
- timestr = opt('allDayText');
- } else if ((duration < DAY_MS || !datestr) && !event.allDay) {
- timestr = formatDates(event.start, event.end, timeFormat);
- }
-
- return [datestr, timestr];
- }
-
- function lazySegBind(container, seg, bindHandlers) {
- container.unbind('mouseover').mouseover(function(ev) {
- var parent = ev.target, e = parent, i, event;
- while (parent != this) {
- e = parent;
- parent = parent.parentNode;
- }
- if ((i = e._fci) !== undefined) {
- e._fci = undefined;
- event = seg.events[i];
- bindHandlers(event, container.children().eq(i), seg);
- $(ev.target).trigger(ev);
- }
- ev.stopPropagation();
- });
- }
-
-}
-
-
-fcViews.list = ListView;
-
-
-function ListView(element, calendar) {
- var t = this;
-
- // exports
- t.render = render;
- t.select = dummy;
- t.unselect = dummy;
- t.getDaySegmentContainer = function(){ return body; };
-
- // imports
- View.call(t, element, calendar, 'list');
- ListEventRenderer.call(t);
- var opt = t.opt;
- var trigger = t.trigger;
- var clearEvents = t.clearEvents;
- var reportEventClear = t.reportEventClear;
- var formatDates = calendar.formatDates;
- var formatDate = calendar.formatDate;
-
- // overrides
- t.setWidth = setWidth;
- t.setHeight = setHeight;
-
- // locals
- var body;
- var firstDay;
- var nwe;
- var tm;
- var colFormat;
-
-
- function render(date, delta) {
- if (delta) {
- addDays(date, opt('listPage') * delta);
- }
- t.start = t.visStart = cloneDate(date, true);
- t.end = addDays(cloneDate(t.start), opt('listPage'));
- t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
- addMinutes(t.visEnd, -1); // set end to 23:59
- t.title = formatDates(date, t.visEnd, opt('titleFormat'));
-
- updateOptions();
-
- if (!body) {
- buildSkeleton();
- } else {
- clearEvents();
- }
- }
-
-
- function updateOptions() {
- firstDay = opt('firstDay');
- nwe = opt('weekends') ? 0 : 1;
- tm = opt('theme') ? 'ui' : 'fc';
- colFormat = opt('columnFormat', 'day');
- }
-
-
- function buildSkeleton() {
- body = $('<div>').addClass('fc-list-content').appendTo(element);
- }
-
- function setHeight(height, dateChanged) {
- if (!opt('listNoHeight'))
- body.css('height', (height-1)+'px').css('overflow', 'auto');
- }
-
- function setWidth(width) {
- // nothing to be done here
- }
-
- function dummy() {
- // Stub.
- }
-
-}
-
-/* Additional view: table (by bruederli at kolabsys.com)
----------------------------------------------------------------------------------*/
-
-function TableEventRenderer() {
- var t = this;
-
- // imports
- ListEventRenderer.call(t);
- var opt = t.opt;
- var sortCmp = t.sortCmp;
- var trigger = t.trigger;
- var compileSegs = t.compileDaySegs;
- var reportEvents = t.reportEvents;
- var reportEventClear = t.reportEventClear;
- var reportEventElement = t.reportEventElement;
- var eventElementHandlers = t.eventElementHandlers;
- var renderEventTime = t.renderEventTime;
- var showEvents = t.showEvents;
- var hideEvents = t.hideEvents;
- var getListContainer = t.getDaySegmentContainer;
- var lazySegBind = t.lazySegBind;
- var calendar = t.calendar;
- var formatDate = calendar.formatDate;
- var formatDates = calendar.formatDates;
-
- // exports
- t.renderEvents = renderEvents;
- t.clearEvents = clearEvents;
-
-
- /* Rendering
- --------------------------------------------------------------------*/
-
- function clearEvents() {
- reportEventClear();
- getListContainer().children('tbody').remove();
- }
-
- function renderEvents(events, modifiedEventId) {
- events.sort(sortCmp);
- reportEvents(events);
- renderSegs(compileSegs(events), modifiedEventId);
- getListContainer().removeClass('fc-list-smart fc-list-day fc-list-month fc-list-week').addClass('fc-list-' + opt('listSections'));
- }
-
- function renderSegs(segs, modifiedEventId) {
- var tm = opt('theme') ? 'ui' : 'fc';
- var table = getListContainer();
- var headerClass = tm + "-widget-header";
- var contentClass = tm + "-widget-content";
- var tableCols = opt('tableCols');
- var timecol = $.inArray('time', tableCols) >= 0;
- var i, j, seg, event, times, s, skinCss, skinCssAttr, skinClasses, rowClasses, segContainer, eventElements, eventElement, triggerRes;
-
- for (j=0; j < segs.length; j++) {
- seg = segs[j];
-
- if (seg.title) {
- $('<tbody class="fc-list-header"><tr><td class="fc-list-header ' + headerClass + '" colspan="' + tableCols.length + '">' + htmlEscape(seg.title) + '</td></tr></tbody>').appendTo(table);
- }
- segContainer = $('<tbody>').addClass('fc-list-section ' + contentClass).appendTo(table);
- s = '';
-
- for (i=0; i < seg.events.length; i++) {
- event = seg.events[i];
- times = renderEventTime(event, seg);
- skinCss = getSkinCss(event, opt);
- skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
- skinClasses = ['fc-event-skin', 'fc-corner-left', 'fc-corner-right', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
- if (event.source && event.source.className) {
- skinClasses = skinClasses.concat(event.source.className);
- }
- rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]];
- if (seg.daydiff == 0) {
- rowClasses.push('fc-today');
- }
-
- s += "<tr class='" + rowClasses.join(' ') + "'>";
- for (var col, c=0; c < tableCols.length; c++) {
- col = tableCols[c];
- if (col == 'handle') {
- s += "<td class='fc-event-handle'>" +
- "<div class='" + skinClasses.join(' ') + "'" + skinCssAttr + ">" +
- "<span class='fc-event-inner'></span>" +
- "</div></td>";
- } else if (col == 'date') {
- s += "<td class='fc-event-date' colspan='" + (times[1] || !timecol ? 1 : 2) + "'>" + htmlEscape(times[0]) + "</td>";
- } else if (col == 'time') {
- if (times[1]) {
- s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
- }
- } else {
- s += "<td class='fc-event-" + col + "'>" + (event[col] ? htmlEscape(event[col]) : ' ') + "</td>";
- }
- }
- s += "</tr>";
-
- // IE doesn't like innerHTML on tbody elements so we insert every row individually
- if (document.all) {
- $(s).appendTo(segContainer);
- s = '';
- }
- }
-
- if (!document.all)
- segContainer[0].innerHTML = s;
-
- eventElements = segContainer.children();
-
- // retrieve elements, run through eventRender callback, bind event handlers
- for (i=0; i < seg.events.length; i++) {
- event = seg.events[i];
- eventElement = $(eventElements[i]); // faster than eq()
- triggerRes = trigger('eventRender', event, event, eventElement);
- if (triggerRes === false) {
- eventElement.remove();
- } else {
- if (triggerRes && triggerRes !== true) {
- eventElement.remove();
- eventElement = $(triggerRes).appendTo(segContainer);
- }
- if (event._id === modifiedEventId) {
- eventElementHandlers(event, eventElement, seg);
- } else {
- eventElement[0]._fci = i; // for lazySegBind
- }
- reportEventElement(event, eventElement);
- }
- }
-
- lazySegBind(segContainer, seg, eventElementHandlers);
- markFirstLast(segContainer);
- }
-
- //markFirstLast(table);
- }
-
-}
-
-
-fcViews.table = TableView;
-
-
-function TableView(element, calendar) {
- var t = this;
-
- // exports
- t.render = render;
- t.select = dummy;
- t.unselect = dummy;
- t.getDaySegmentContainer = function(){ return table; };
-
- // imports
- View.call(t, element, calendar, 'table');
- TableEventRenderer.call(t);
- var opt = t.opt;
- var trigger = t.trigger;
- var clearEvents = t.clearEvents;
- var reportEventClear = t.reportEventClear;
- var formatDates = calendar.formatDates;
- var formatDate = calendar.formatDate;
-
- // overrides
- t.setWidth = setWidth;
- t.setHeight = setHeight;
-
- // locals
- var div;
- var table;
- var firstDay;
- var nwe;
- var tm;
- var colFormat;
-
-
- function render(date, delta) {
- if (delta) {
- addDays(date, opt('listPage') * delta);
- }
- t.start = t.visStart = cloneDate(date, true);
- t.end = addDays(cloneDate(t.start), opt('listPage'));
- t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
- addMinutes(t.visEnd, -1); // set end to 23:59
- t.title = (t.visEnd.getTime() - t.visStart.getTime() < DAY_MS) ? formatDate(date, opt('titleFormat')) : formatDates(date, t.visEnd, opt('titleFormat'));
-
- updateOptions();
-
- if (!table) {
- buildSkeleton();
- } else {
- clearEvents();
- }
- }
-
-
- function updateOptions() {
- firstDay = opt('firstDay');
- nwe = opt('weekends') ? 0 : 1;
- tm = opt('theme') ? 'ui' : 'fc';
- colFormat = opt('columnFormat');
- }
-
-
- function buildSkeleton() {
- var tableCols = opt('tableCols');
- var s =
- "<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
- "<colgroup>";
- for (var c=0; c < tableCols.length; c++) {
- s += "<col class='fc-event-" + tableCols[c] + "' />";
- }
- s += "</colgroup>" +
- "</table>";
- div = $('<div>').addClass('fc-list-content').appendTo(element);
- table = $(s).appendTo(div);
- }
-
- function setHeight(height, dateChanged) {
- if (!opt('listNoHeight'))
- div.css('height', (height-1)+'px').css('overflow', 'auto');
- }
-
- function setWidth(width) {
- // nothing to be done here
- }
-
- function dummy() {
- // Stub.
- }
-
-}
+;;
-})(jQuery);
+})(jQuery);
\ No newline at end of file
diff --git a/plugins/calendar/print.js b/plugins/calendar/print.js
index 89f7cb8..731a7d2 100644
--- a/plugins/calendar/print.js
+++ b/plugins/calendar/print.js
@@ -126,7 +126,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
// event rendering
eventRender: function(event, element, view) {
if (view.name != 'month') {
- var cont = element.find('div.fc-event-title');
+ var cont = element.find('.fc-event-title');
if (event.location) {
cont.after('<div class="fc-event-location">@ ' + Q(event.location) + '</div>');
cont = cont.next();
@@ -136,9 +136,9 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
}
/* TODO: create icons black on white
if (event.recurrence)
- element.find('div.fc-event-time').append('<i class="fc-icon-recurring"></i>');
+ element.find('.fc-event-time').append('<i class="fc-icon-recurring"></i>');
if (event.alarms)
- element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>');
+ element.find('.fc-event-time').append('<i class="fc-icon-alarms"></i>');
*/
}
if (view.name == 'table' && event.description && showdesc) {
diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css
index 0f3ba5f..5ec806c 100644
--- a/plugins/calendar/skins/classic/calendar.css
+++ b/plugins/calendar/skins/classic/calendar.css
@@ -369,7 +369,7 @@ pre {
}
.calendarmain #quicksearchbar {
- top: 82px;
+ top: 80px;
right: 4px;
}
@@ -1380,7 +1380,7 @@ span.spacer {
#calendar .fc-header-right {
padding-right: 200px;
- padding-top: 4px;
+ padding-top: 0;
}
.rcube-fc-content {
@@ -1421,7 +1421,7 @@ span.spacer {
font-style:italic;
}
-div.fc-event-location {
+.fc-event-location {
font-size: 90%;
}
@@ -1466,6 +1466,14 @@ div.fc-event-location {
cursor: pointer;
}
+#calendar .fc-event-vert .fc-event-head,
+#calendar .fc-event-vert .fc-event-content {
+ position: relative;
+ z-index: 2;
+ width: 100%;
+ overflow: hidden;
+}
+
.fc-view-list div.fc-list-header,
.fc-view-table td.fc-list-header,
.edit-attendees-table thead td {
diff --git a/plugins/calendar/skins/classic/fullcalendar.css b/plugins/calendar/skins/classic/fullcalendar.css
deleted file mode 100644
index bf9e7dd..0000000
--- a/plugins/calendar/skins/classic/fullcalendar.css
+++ /dev/null
@@ -1,724 +0,0 @@
-/*
- * 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: Wed Nov 7 16:28:11 2012 +0100
- *
- */
-
-
-.fc {
- direction: ltr;
- text-align: left;
- }
-
-.fc table {
- border-collapse: collapse;
- border-spacing: 0;
- }
-
-html .fc,
-.fc table {
- font-size: 1em;
- }
-
-.fc td,
-.fc th {
- padding: 0;
- vertical-align: top;
- }
-
-
-
-/* Header
-------------------------------------------------------------------------*/
-
-.fc-header td {
- white-space: nowrap;
- }
-
-.fc-header-left {
- width: 25%;
- text-align: left;
- }
-
-.fc-header-center {
- text-align: center;
- }
-
-.fc-header-right {
- width: 25%;
- text-align: right;
- }
-
-.fc-header-title {
- display: inline-block;
- vertical-align: top;
- }
-
-.fc-header-title h2 {
- margin-top: 0;
- white-space: nowrap;
- }
-
-.fc .fc-header-space {
- padding-left: 10px;
- }
-
-.fc-header .fc-button {
- margin-bottom: 1em;
- vertical-align: top;
- }
-
-/* buttons edges butting together */
-
-.fc-header .fc-button {
- margin-right: -1px;
- }
-
-.fc-header .fc-corner-right {
- margin-right: 1px; /* back to normal */
- }
-
-.fc-header .ui-corner-right {
- margin-right: 0; /* back to normal */
- }
-
-/* button layering (for border precedence) */
-
-.fc-header .fc-state-hover,
-.fc-header .ui-state-hover {
- z-index: 2;
- }
-
-.fc-header .fc-state-down {
- z-index: 3;
- }
-
-.fc-header .fc-state-active,
-.fc-header .ui-state-active {
- z-index: 4;
- }
-
-
-
-/* Content
-------------------------------------------------------------------------*/
-
-.fc-content {
- clear: both;
- }
-
-.fc-view {
- width: 100%; /* needed for view switching (when view is absolute) */
- overflow: hidden;
- }
-
-
-
-/* Cell Styles
-------------------------------------------------------------------------*/
-
-.fc-widget-header, /* <th>, usually */
-.fc-widget-content { /* <td>, usually */
- border: 1px solid #ccc;
- }
-
-.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
- background: #ffc;
- }
-
-.fc-cell-overlay { /* semi-transparent rectangle while dragging */
- background: #9cf;
- opacity: .2;
- filter: alpha(opacity=20); /* for IE */
- }
-
-
-
-/* Buttons
-------------------------------------------------------------------------*/
-
-.fc-button {
- position: relative;
- display: inline-block;
- cursor: pointer;
- }
-
-.fc-state-default { /* non-theme */
- border-style: solid;
- border-width: 1px 0;
- }
-
-.fc-button-inner {
- position: relative;
- float: left;
- overflow: hidden;
- }
-
-.fc-state-default .fc-button-inner { /* non-theme */
- border-style: solid;
- border-width: 0 1px;
- }
-
-.fc-button-content {
- position: relative;
- float: left;
- height: 1.9em;
- line-height: 1.9em;
- padding: 0 .6em;
- white-space: nowrap;
- }
-
-/* icon (for jquery ui) */
-
-.fc-button-content .fc-icon-wrap {
- position: relative;
- float: left;
- top: 50%;
- }
-
-.fc-button-content .ui-icon {
- position: relative;
- float: left;
- margin-top: -50%;
- *margin-top: 0;
- *top: -50%;
- }
-
-/* gloss effect */
-
-.fc-state-default .fc-button-effect {
- position: absolute;
- top: 50%;
- left: 0;
- }
-
-.fc-state-default .fc-button-effect span {
- position: absolute;
- top: -100px;
- left: 0;
- width: 500px;
- height: 100px;
- border-width: 100px 0 0 1px;
- border-style: solid;
- border-color: #fff;
- background: #444;
- opacity: .09;
- filter: alpha(opacity=9);
- }
-
-/* button states (determines colors) */
-
-.fc-state-default,
-.fc-state-default .fc-button-inner {
- border-style: solid;
- border-color: #ccc #bbb #aaa;
- background: #F3F3F3;
- color: #000;
- }
-
-.fc-state-hover,
-.fc-state-hover .fc-button-inner {
- border-color: #999;
- }
-
-.fc-state-down,
-.fc-state-down .fc-button-inner {
- border-color: #555;
- background: #777;
- }
-
-.fc-state-active,
-.fc-state-active .fc-button-inner {
- border-color: #555;
- background: #777;
- color: #fff;
- }
-
-.fc-state-disabled,
-.fc-state-disabled .fc-button-inner {
- color: #999;
- border-color: #ddd;
- }
-
-.fc-state-disabled {
- cursor: default;
- }
-
-.fc-state-disabled .fc-button-effect {
- display: none;
- }
-
-
-
-/* Global Event Styles
-------------------------------------------------------------------------*/
-
-.fc-event {
- border-style: solid;
- border-width: 0;
- font-size: .85em;
- cursor: default;
- }
-
-a.fc-event,
-.fc-event-draggable {
- cursor: pointer;
- }
-
-a.fc-event {
- text-decoration: none;
- }
-
-.fc-rtl .fc-event {
- text-align: right;
- }
-
-.fc-event-skin {
- border-color: #36c; /* default BORDER color */
- background-color: #36c; /* default BACKGROUND color */
- color: #fff; /* default TEXT color */
- }
-
-.fc-event-inner {
- position: relative;
- width: 100%;
- height: 100%;
- border-style: solid;
- border-width: 0;
- overflow: hidden;
- }
-
-.fc-event-time,
-.fc-event-title {
- padding: 0 1px;
- }
-
-.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
- display: block;
- position: absolute;
- z-index: 99999;
- overflow: hidden; /* hacky spaces (IE6/7) */
- font-size: 300%; /* */
- line-height: 50%; /* */
- }
-
-
-
-/* Horizontal Events
-------------------------------------------------------------------------*/
-
-.fc-event-hori {
- border-width: 1px 0;
- margin-bottom: 1px;
- }
-
-/* resizable */
-
-.fc-event-hori .ui-resizable-e {
- top: 0 !important; /* importants override pre jquery ui 1.7 styles */
- right: -3px !important;
- width: 7px !important;
- height: 100% !important;
- cursor: e-resize;
- }
-
-.fc-event-hori .ui-resizable-w {
- top: 0 !important;
- left: -3px !important;
- width: 7px !important;
- height: 100% !important;
- cursor: w-resize;
- }
-
-.fc-event-hori .ui-resizable-handle {
- _padding-bottom: 14px; /* IE6 had 0 height */
- }
-
-
-
-/* Fake Rounded Corners (for buttons and events)
-------------------------------------------------------------*/
-
-.fc-corner-left {
- margin-left: 1px;
- }
-
-.fc-corner-left .fc-button-inner,
-.fc-corner-left .fc-event-inner {
- margin-left: -1px;
- }
-
-.fc-corner-right {
- margin-right: 1px;
- }
-
-.fc-corner-right .fc-button-inner,
-.fc-corner-right .fc-event-inner {
- margin-right: -1px;
- }
-
-.fc-corner-top {
- margin-top: 1px;
- }
-
-.fc-corner-top .fc-event-inner {
- margin-top: -1px;
- }
-
-.fc-corner-bottom {
- margin-bottom: 1px;
- }
-
-.fc-corner-bottom .fc-event-inner {
- margin-bottom: -1px;
- }
-
-
-
-/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
------------------------------------------------------------------*/
-
-.fc-corner-left .fc-event-inner {
- border-left-width: 1px;
- }
-
-.fc-corner-right .fc-event-inner {
- border-right-width: 1px;
- }
-
-.fc-corner-top .fc-event-inner {
- border-top-width: 1px;
- }
-
-.fc-corner-bottom .fc-event-inner {
- border-bottom-width: 1px;
- }
-
-
-
-/* Reusable Separate-border Table
-------------------------------------------------------------*/
-
-table.fc-border-separate {
- border-collapse: separate;
- }
-
-.fc-border-separate th,
-.fc-border-separate td {
- border-width: 1px 0 0 1px;
- }
-
-.fc-border-separate th.fc-last,
-.fc-border-separate td.fc-last {
- border-right-width: 1px;
- }
-
-.fc-border-separate tr.fc-last th,
-.fc-border-separate tr.fc-last td {
- border-bottom-width: 1px;
- }
-
-.fc-border-separate tbody tr.fc-first td,
-.fc-border-separate tbody tr.fc-first th {
- border-top-width: 0;
- }
-
-
-
-/* Month View, Basic Week View, Basic Day View
-------------------------------------------------------------------------*/
-
-.fc-grid th {
- text-align: center;
- }
-
-.fc-grid .fc-day-number {
- float: right;
- padding: 0 2px;
- }
-
-.fc-grid .fc-other-month .fc-day-number {
- opacity: 0.3;
- filter: alpha(opacity=30); /* for IE */
- /* opacity with small font can sometimes look too faded
- might want to set the 'color' property instead
- making day-numbers bold also fixes the problem */
- }
-
-.fc-grid .fc-day-content {
- clear: both;
- padding: 2px 2px 1px; /* distance between events and day edges */
- }
-
-/* event styles */
-
-.fc-grid .fc-event-time {
- font-weight: bold;
- }
-
-/* right-to-left */
-
-.fc-rtl .fc-grid .fc-day-number {
- float: left;
- }
-
-.fc-rtl .fc-grid .fc-event-time {
- float: right;
- }
-
-.fc-more-link {
- font-size: 0.85em;
- white-space: nowrap;
- text-decoration: none;
- cursor: pointer;
- padding: 1px;
-}
-
-/* Agenda Week View, Agenda Day View
-------------------------------------------------------------------------*/
-
-.fc-agenda table {
- border-collapse: separate;
- }
-
-.fc-agenda-days th {
- text-align: center;
- }
-
-.fc-agenda .fc-agenda-axis {
- width: 50px;
- padding: 0 4px;
- vertical-align: middle;
- text-align: right;
- white-space: nowrap;
- font-weight: normal;
- }
-
-.fc-agenda .fc-day-content {
- padding: 2px 2px 1px;
- }
-
-/* make axis border take precedence */
-
-.fc-agenda-days .fc-agenda-axis {
- border-right-width: 1px;
- }
-
-.fc-agenda-days .fc-col0 {
- border-left-width: 0;
- }
-
-/* all-day area */
-
-.fc-agenda-allday th {
- border-width: 0 1px;
- }
-
-.fc-agenda-allday .fc-day-content {
- min-height: 34px; /* TODO: doesnt work well in quirksmode */
- _height: 34px;
- }
-
-/* divider (between all-day and slots) */
-
-.fc-agenda-divider-inner {
- height: 2px;
- overflow: hidden;
- }
-
-.fc-widget-header .fc-agenda-divider-inner {
- background: #eee;
- }
-
-/* slot rows */
-
-.fc-agenda-slots th {
- border-width: 1px 1px 0;
- }
-
-.fc-agenda-slots td {
- border-width: 1px 0 0;
- background: none;
- }
-
-.fc-agenda-slots td div {
- height: 20px;
- }
-
-.fc-agenda-slots tr.fc-slot0 th,
-.fc-agenda-slots tr.fc-slot0 td {
- border-top-width: 0;
- }
-
-.fc-agenda-slots tr.fc-minor th,
-.fc-agenda-slots tr.fc-minor td {
- border-top-style: dotted;
- }
-
-.fc-agenda-slots tr.fc-minor th.ui-widget-header {
- *border-top-style: solid; /* doesn't work with background in IE6/7 */
- }
-
-
-
-/* Vertical Events
-------------------------------------------------------------------------*/
-
-.fc-event-vert {
- border-width: 0 1px;
- }
-
-.fc-event-vert .fc-event-head,
-.fc-event-vert .fc-event-content {
- position: relative;
- z-index: 2;
- width: 100%;
- overflow: hidden;
- }
-
-.fc-event-vert .fc-event-time {
- white-space: nowrap;
- font-size: 10px;
- }
-
-.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */
- position: absolute;
- z-index: 1;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background: #fff;
- opacity: .3;
- filter: alpha(opacity=30);
- }
-
-.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
-.fc-select-helper .fc-event-bg {
- display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
- }
-
-/* resizable */
-
-.fc-event-vert .ui-resizable-s {
- bottom: 0 !important; /* importants override pre jquery ui 1.7 styles */
- width: 100% !important;
- height: 8px !important;
- overflow: hidden !important;
- line-height: 8px !important;
- font-size: 11px !important;
- font-family: monospace;
- text-align: center;
- cursor: s-resize;
- }
-
-.fc-agenda .ui-resizable-resizing { /* TODO: better selector */
- _overflow: hidden;
- }
-
-.fc-timeline {
- position: absolute;
- width: 100%;
- left: 0;
- margin: 0;
- padding: 0;
- border: none;
- border-top: 2px solid #3ec400;
- z-index: 999;
-}
-
-/* List view (by bruederli at kolabsys.com)
-------------------------------------------------------------------------*/
-
-.fc-view-list,
-.fc-view-table {
- border: 1px solid #ccc;
- width: auto;
-}
-
-.fc-view-list .fc-list-header,
-.fc-view-table td.fc-list-header {
- border-width: 0;
- border-bottom-width: 1px;
- padding: 3px 5px;
-}
-
-.fc-view-table .fc-first td.fc-list-header {
- border-top-width: 0;
-}
-
-.fc-list-section {
- padding: 4px 2px;
- border-width: 0;
- border-bottom-width: 1px;
-}
-
-.fc-view-list .fc-last {
- border-bottom-width: 0;
-}
-
-.fc-list-section .fc-event {
- position: relative;
- margin: 1px 2px 3px 2px;
-}
-
-.fc-view-table tr.fc-event td {
- padding: 2px;
- border-bottom: 1px solid #ccc;
-}
-
-.fc-view-table tr.fc-event td.fc-event-handle {
- padding: 3px 8px 3px 3px;
-}
-
-.fc-view-table .fc-event-handle .fc-event-skin {
- border-radius: 2px;
- -moz-border-radius: 2px;
-}
-
-.fc-view-table .fc-event-handle .fc-event-inner {
- display: block;
- width: 8px;
- height: 10px;
- border-radius: 2px;
- -moz-border-radius: 2px;
-}
-
-.fc-view-table table {
- table-layout: fixed;
- width: 100%;
-}
-
-.fc-view-table col.fc-event-handle {
- width: 18px;
-}
-
-.fc-event-handle .fc-event-inner {
- border-color: inherit;
- background-color: inherit;
-}
-
-.fc-view-table col.fc-event-date {
- width: 7em;
-}
-
-.fc-view-table .fc-list-day col.fc-event-date {
- width: 1px;
-}
-
-.fc-view-table col.fc-event-time {
- width: 8em;
-}
-
-.fc-view-table td.fc-event-date,
-.fc-view-table td.fc-event-time {
- white-space: nowrap;
- padding-right: 1em;
-}
-
diff --git a/plugins/calendar/skins/classic/fullcalendar.css b/plugins/calendar/skins/classic/fullcalendar.css
new file mode 120000
index 0000000..4adce7a
--- /dev/null
+++ b/plugins/calendar/skins/classic/fullcalendar.css
@@ -0,0 +1 @@
+../larry/fullcalendar.css
\ No newline at end of file
diff --git a/plugins/calendar/skins/classic/print.css b/plugins/calendar/skins/classic/print.css
index f332d62..908d760 100644
--- a/plugins/calendar/skins/classic/print.css
+++ b/plugins/calendar/skins/classic/print.css
@@ -130,7 +130,7 @@ body, td, th, div, p, h3, select, input, textarea {
font-style: italic;
}
-div.fc-event-location {
+.fc-event-location {
font-size: 90%;
}
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index adca758..bd1d489 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -1303,15 +1303,11 @@ a.dropdown-link:after {
}
.calendarmain .fc-button,
-.calendarmain .fc-button.fc-state-hover,
-.calendarmain .fc-button.fc-state-down {
- border: 0;
- background: none;
-}
-
-.calendarmain .fc-state-default .fc-button-inner,
-.calendarmain .fc-state-hover .fc-button-inner {
+.calendarmain .fc-button.fc-state-default,
+.calendarmain .fc-button.fc-state-hover {
margin: 0 0 0 0;
+ height: 20px;
+ line-height: 20px;
color: #505050;
text-shadow: 0px 1px 1px #fff;
border: 1px solid #e6e6e6;
@@ -1328,17 +1324,12 @@ a.dropdown-link:after {
text-decoration: none;
}
-.calendarmain .fc-state-disabled .fc-button-inner {
+.calendarmain .fc-button.fc-state-disabled {
color: #999;
background: #d8d8d8;
}
-.calendarmain .fc-header .fc-button {
- margin-left: -1px;
- margin-right: 0;
-}
-
-.calendarmain .fc-state-down .fc-button-inner {
+.calendarmain .fc-button.fc-state-down {
margin: 0;
background: #bababa;
background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
@@ -1348,7 +1339,7 @@ a.dropdown-link:after {
background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
}
-.calendarmain .fc-state-active .fc-button-inner {
+.calendarmain .fc-button.fc-state-active {
color: #333;
background: #bababa;
background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
@@ -1358,34 +1349,13 @@ a.dropdown-link:after {
background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
}
-.calendarmain .fc-corner-left .fc-button-inner,
-.calendarmain .fc-corner-left .fc-button-content {
- border-top-left-radius: 4px;
- border-bottom-left-radius: 4px;
-}
-
-.calendarmain .fc-corner-right .fc-button-inner,
-.calendarmain .fc-corner-right .fc-button-content {
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
-}
-
-.calendarmain .fc-button-effect {
- display: none;
-}
-
-.calendarmain .fc-button-content {
- height: 20px;
- line-height: 20px;
+.calendarmain .fc-header .fc-button {
+ margin-left: -1px;
+ margin-right: 0;
}
.calendarmain .fc-header-left .fc-button {
- margin: -7px 0 0 0;
- padding: 0;
-}
-
-.calendarmain .fc-header-left .fc-state-default .fc-button-inner,
-.calendarmain .fc-header-left .fc-state-hover .fc-button-inner {
+ display: inline-block;
margin: 0;
text-align: center;
font-size: 10px;
@@ -1393,9 +1363,11 @@ a.dropdown-link:after {
min-width: 50px;
max-width: 75px;
height: 13px;
+ line-height: 1em;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+ margin: -7px 0 0 0;
padding: 28px 2px 0 2px;
text-shadow: 0px 1px 1px #EEE;
border: 0;
@@ -1406,46 +1378,40 @@ a.dropdown-link:after {
-moz-box-shadow: none;
}
-.calendarmain .fc-header-left .fc-button-content {
- float: none;
- line-height: 1em;
- padding: 0;
-}
-
-.calendarmain .fc-header-left .fc-state-active .fc-button-content {
+.calendarmain .fc-header-left .fc-button.fc-state-active {
font-weight: bold;
color: #222;
}
-.calendarmain .fc-header-left .fc-button-agendaDay .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-agendaDay {
background-position: center -120px;
}
-.calendarmain .fc-header-left .fc-button-agendaDay.fc-state-active .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-agendaDay.fc-state-active {
background-position: center -160px;
}
-.calendarmain .fc-header-left .fc-button-agendaWeek .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-agendaWeek {
background-position: center -200px;
}
-.calendarmain .fc-header-left .fc-button-agendaWeek.fc-state-active .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-agendaWeek.fc-state-active {
background-position: center -240px;
}
-.calendarmain .fc-header-left .fc-button-month .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-month {
background-position: center -280px;
}
-.calendarmain .fc-header-left .fc-button-month.fc-state-active .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-month.fc-state-active {
background-position: center -320px;
}
-.calendarmain .fc-header-left .fc-button-table .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-table {
background-position: center -360px;
}
-.calendarmain .fc-header-left .fc-button-table.fc-state-active .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-table.fc-state-active {
background-position: center -400px;
}
@@ -1487,6 +1453,10 @@ a.dropdown-link:after {
padding-right: 0.3em;
}
+.calendarmain .fc-event-vert .fc-event-inner {
+ z-index: 0;
+}
+
.fc-event-cateories {
font-style:italic;
}
@@ -1580,6 +1550,7 @@ div.fc-event-location {
width: 10px;
height: 10px;
padding: 0;
+ margin: -1px;
font-size: 10px;
border-radius: 8px;
border: 1px solid rgba(0, 0, 0, 0.4);
diff --git a/plugins/calendar/skins/larry/fullcalendar.css b/plugins/calendar/skins/larry/fullcalendar.css
deleted file mode 120000
index aa002ea..0000000
--- a/plugins/calendar/skins/larry/fullcalendar.css
+++ /dev/null
@@ -1 +0,0 @@
-../classic/fullcalendar.css
\ No newline at end of file
diff --git a/plugins/calendar/skins/larry/fullcalendar.css b/plugins/calendar/skins/larry/fullcalendar.css
new file mode 100644
index 0000000..c6e36e7
--- /dev/null
+++ b/plugins/calendar/skins/larry/fullcalendar.css
@@ -0,0 +1,707 @@
+/*!
+ * FullCalendar v1.6.4-rcube-1.0 Stylesheet
+ * Docs & License: http://arshaw.com/fullcalendar/
+ * (c) 2013 Adam Shaw, 2014 Kolab Systems AG
+ */
+
+
+.fc {
+ direction: ltr;
+ text-align: left;
+ }
+
+.fc table {
+ border-collapse: collapse;
+ border-spacing: 0;
+ }
+
+html .fc,
+.fc table {
+ font-size: 1em;
+ }
+
+.fc td,
+.fc th {
+ padding: 0;
+ vertical-align: top;
+ }
+
+
+
+/* Header
+------------------------------------------------------------------------*/
+
+.fc-header td {
+ white-space: nowrap;
+ }
+
+.fc-header-left {
+ width: 25%;
+ text-align: left;
+ }
+
+.fc-header-center {
+ text-align: center;
+ }
+
+.fc-header-right {
+ width: 25%;
+ text-align: right;
+ }
+
+.fc-header-title {
+ display: inline-block;
+ vertical-align: top;
+ }
+
+.fc-header-title h2 {
+ margin-top: 0;
+ white-space: nowrap;
+ }
+
+.fc .fc-header-space {
+ padding-left: 10px;
+ }
+
+.fc-header .fc-button {
+ margin-bottom: 1em;
+ vertical-align: top;
+ }
+
+/* buttons edges butting together */
+
+.fc-header .fc-button {
+ margin-right: -1px;
+ }
+
+.fc-header .fc-corner-right, /* non-theme */
+.fc-header .ui-corner-right { /* theme */
+ margin-right: 0; /* back to normal */
+ }
+
+/* button layering (for border precedence) */
+
+.fc-header .fc-state-hover,
+.fc-header .ui-state-hover {
+ z-index: 2;
+ }
+
+.fc-header .fc-state-down {
+ z-index: 3;
+ }
+
+.fc-header .fc-state-active,
+.fc-header .ui-state-active {
+ z-index: 4;
+ }
+
+
+
+/* Content
+------------------------------------------------------------------------*/
+
+.fc-content {
+ clear: both;
+ zoom: 1; /* for IE7, gives accurate coordinates for [un]freezeContentHeight */
+ }
+
+.fc-view {
+ width: 100%;
+ overflow: hidden;
+ }
+
+
+
+/* Cell Styles
+------------------------------------------------------------------------*/
+
+.fc-widget-header, /* <th>, usually */
+.fc-widget-content { /* <td>, usually */
+ border: 1px solid #ddd;
+ }
+
+.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
+ background: #fcf8e3;
+ }
+
+.fc-cell-overlay { /* semi-transparent rectangle while dragging */
+ background: #bce8f1;
+ opacity: .3;
+ filter: alpha(opacity=30); /* for IE */
+ }
+
+
+
+/* Buttons
+------------------------------------------------------------------------*/
+
+.fc-button {
+ position: relative;
+ display: inline-block;
+ padding: 0 .6em;
+ overflow: hidden;
+ height: 1.9em;
+ line-height: 1.9em;
+ white-space: nowrap;
+ cursor: pointer;
+ }
+
+.fc-state-default { /* non-theme */
+ border: 1px solid;
+ }
+
+.fc-state-default.fc-corner-left { /* non-theme */
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ }
+
+.fc-state-default.fc-corner-right { /* non-theme */
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ }
+
+/*
+ Our default prev/next buttons use HTML entities like ‹ › « »
+ and we'll try to make them look good cross-browser.
+*/
+
+.fc-text-arrow {
+ margin: 0 .1em;
+ font-size: 2em;
+ font-family: "Courier New", Courier, monospace;
+ vertical-align: baseline; /* for IE7 */
+ }
+
+.fc-button-prev .fc-text-arrow,
+.fc-button-next .fc-text-arrow { /* for ‹ › */
+ font-weight: bold;
+ }
+
+/* icon (for jquery ui) */
+
+.fc-button .fc-icon-wrap {
+ position: relative;
+ float: left;
+ top: 50%;
+ }
+
+.fc-button .ui-icon {
+ position: relative;
+ float: left;
+ margin-top: -50%;
+ *margin-top: 0;
+ *top: -50%;
+ }
+
+/*
+ button states
+ borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/)
+*/
+
+.fc-state-default {
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+ background-repeat: repeat-x;
+ border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ color: #333;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ }
+
+.fc-state-hover,
+.fc-state-down,
+.fc-state-active,
+.fc-state-disabled {
+ color: #333333;
+ background-color: #e6e6e6;
+ }
+
+.fc-state-hover {
+ color: #333333;
+ text-decoration: none;
+ background-position: 0 -15px;
+ -webkit-transition: background-position 0.1s linear;
+ -moz-transition: background-position 0.1s linear;
+ -o-transition: background-position 0.1s linear;
+ transition: background-position 0.1s linear;
+ }
+
+.fc-state-down,
+.fc-state-active {
+ background-color: #cccccc;
+ background-image: none;
+ outline: 0;
+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ }
+
+.fc-state-disabled {
+ cursor: default;
+ background-image: none;
+ opacity: 0.65;
+ filter: alpha(opacity=65);
+ box-shadow: none;
+ }
+
+
+
+/* Global Event Styles
+------------------------------------------------------------------------*/
+
+.fc-event-container > * {
+ z-index: 8;
+ }
+
+.fc-event-container > .ui-draggable-dragging,
+.fc-event-container > .ui-resizable-resizing {
+ z-index: 9;
+ }
+
+.fc-event {
+ border: 1px solid #3a87ad; /* default BORDER color */
+ background-color: #3a87ad; /* default BACKGROUND color */
+ color: #fff; /* default TEXT color */
+ font-size: .85em;
+ cursor: default;
+ }
+
+a.fc-event {
+ text-decoration: none;
+ }
+
+a.fc-event,
+.fc-event-draggable {
+ cursor: pointer;
+ }
+
+.fc-rtl .fc-event {
+ text-align: right;
+ }
+
+.fc-event-inner {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ }
+
+.fc-event-time,
+.fc-event-title {
+ padding: 0 1px;
+ }
+
+.fc .ui-resizable-handle {
+ display: block;
+ position: absolute;
+ z-index: 99999;
+ overflow: hidden; /* hacky spaces (IE6/7) */
+ font-size: 300%; /* */
+ line-height: 50%; /* */
+ }
+
+
+
+/* Horizontal Events
+------------------------------------------------------------------------*/
+
+.fc-event-hori {
+ border-width: 1px 0;
+ margin-bottom: 1px;
+ }
+
+.fc-ltr .fc-event-hori.fc-event-start,
+.fc-rtl .fc-event-hori.fc-event-end {
+ border-left-width: 1px;
+ border-top-left-radius: 3px;
+ border-bottom-left-radius: 3px;
+ }
+
+.fc-ltr .fc-event-hori.fc-event-end,
+.fc-rtl .fc-event-hori.fc-event-start {
+ border-right-width: 1px;
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+ }
+
+/* resizable */
+
+.fc-event-hori .ui-resizable-e {
+ top: 0 !important; /* importants override pre jquery ui 1.7 styles */
+ right: -3px !important;
+ width: 7px !important;
+ height: 100% !important;
+ cursor: e-resize;
+ }
+
+.fc-event-hori .ui-resizable-w {
+ top: 0 !important;
+ left: -3px !important;
+ width: 7px !important;
+ height: 100% !important;
+ cursor: w-resize;
+ }
+
+.fc-event-hori .ui-resizable-handle {
+ _padding-bottom: 14px; /* IE6 had 0 height */
+ }
+
+
+
+/* Reusable Separate-border Table
+------------------------------------------------------------*/
+
+table.fc-border-separate {
+ border-collapse: separate;
+ }
+
+.fc-border-separate th,
+.fc-border-separate td {
+ border-width: 1px 0 0 1px;
+ }
+
+.fc-border-separate th.fc-last,
+.fc-border-separate td.fc-last {
+ border-right-width: 1px;
+ }
+
+.fc-border-separate tr.fc-last th,
+.fc-border-separate tr.fc-last td {
+ border-bottom-width: 1px;
+ }
+
+.fc-border-separate tbody tr.fc-first td,
+.fc-border-separate tbody tr.fc-first th {
+ border-top-width: 0;
+ }
+
+
+
+/* Month View, Basic Week View, Basic Day View
+------------------------------------------------------------------------*/
+
+.fc-grid th {
+ text-align: center;
+ }
+
+.fc .fc-week-number {
+ width: 22px;
+ text-align: center;
+ }
+
+.fc .fc-week-number div {
+ padding: 0 2px;
+ }
+
+.fc-grid .fc-day-number {
+ float: right;
+ padding: 0 2px;
+ }
+
+.fc-grid .fc-other-month .fc-day-number {
+ opacity: 0.3;
+ filter: alpha(opacity=30); /* for IE */
+ /* opacity with small font can sometimes look too faded
+ might want to set the 'color' property instead
+ making day-numbers bold also fixes the problem */
+ }
+
+.fc-grid .fc-day-content {
+ clear: both;
+ padding: 2px 2px 1px; /* distance between events and day edges */
+ }
+
+/* event styles */
+
+.fc-grid .fc-event-time {
+ font-weight: bold;
+ }
+
+/* right-to-left */
+
+.fc-rtl .fc-grid .fc-day-number {
+ float: left;
+ }
+
+.fc-rtl .fc-grid .fc-event-time {
+ float: right;
+ }
+
+.fc-more-link {
+ font-size: 0.85em;
+ white-space: nowrap;
+ text-decoration: none;
+ cursor: pointer;
+ padding: 1px;
+}
+
+/* Agenda Week View, Agenda Day View
+------------------------------------------------------------------------*/
+
+.fc-agenda table {
+ border-collapse: separate;
+ }
+
+.fc-agenda-days th {
+ text-align: center;
+ }
+
+.fc-agenda .fc-agenda-axis {
+ width: 50px;
+ padding: 0 4px;
+ vertical-align: middle;
+ text-align: right;
+ white-space: nowrap;
+ font-weight: normal;
+ }
+
+.fc-agenda .fc-week-number {
+ font-weight: bold;
+ }
+
+.fc-agenda .fc-day-content {
+ padding: 2px 2px 1px;
+ }
+
+/* make axis border take precedence */
+
+.fc-agenda-days .fc-agenda-axis {
+ border-right-width: 1px;
+ }
+
+.fc-agenda-days .fc-col0 {
+ border-left-width: 0;
+ }
+
+/* all-day area */
+
+.fc-agenda-allday th {
+ border-width: 0 1px;
+ }
+
+.fc-agenda-allday .fc-day-content {
+ min-height: 34px; /* TODO: doesnt work well in quirksmode */
+ _height: 34px;
+ }
+
+/* divider (between all-day and slots) */
+
+.fc-agenda-divider-inner {
+ height: 2px;
+ overflow: hidden;
+ }
+
+.fc-widget-header .fc-agenda-divider-inner {
+ background: #eee;
+ }
+
+/* slot rows */
+
+.fc-agenda-slots th {
+ border-width: 1px 1px 0;
+ }
+
+.fc-agenda-slots td {
+ border-width: 1px 0 0;
+ background: none;
+ }
+
+.fc-agenda-slots td div {
+ height: 20px;
+ }
+
+.fc-agenda-slots tr.fc-slot0 th,
+.fc-agenda-slots tr.fc-slot0 td {
+ border-top-width: 0;
+ }
+
+.fc-agenda-slots tr.fc-minor th,
+.fc-agenda-slots tr.fc-minor td {
+ border-top-style: dotted;
+ }
+
+.fc-agenda-slots tr.fc-minor th.ui-widget-header {
+ *border-top-style: solid; /* doesn't work with background in IE6/7 */
+ }
+
+
+
+/* Vertical Events
+------------------------------------------------------------------------*/
+
+.fc-event-vert {
+ border-width: 0 1px;
+ }
+
+.fc-event-vert .fc-event-head,
+.fc-event-vert .fc-event-content {
+ position: relative;
+ z-index: 2;
+ width: 100%;
+ overflow: hidden;
+ }
+
+.fc-event-vert.fc-event-start {
+ border-top-width: 1px;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ }
+
+.fc-event-vert.fc-event-end {
+ border-bottom-width: 1px;
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
+ }
+
+.fc-event-vert .fc-event-time {
+ white-space: nowrap;
+ font-size: 10px;
+ }
+
+.fc-event-vert .fc-event-inner {
+ position: relative;
+ z-index: 2;
+ }
+
+.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */
+ position: absolute;
+ z-index: 1;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: #fff;
+ opacity: .25;
+ filter: alpha(opacity=25);
+ }
+
+.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
+.fc-select-helper .fc-event-bg {
+ display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
+ }
+
+/* resizable */
+
+.fc-event-vert .ui-resizable-s {
+ bottom: 0 !important; /* importants override pre jquery ui 1.7 styles */
+ width: 100% !important;
+ height: 8px !important;
+ overflow: hidden !important;
+ line-height: 8px !important;
+ font-size: 11px !important;
+ font-family: monospace;
+ text-align: center;
+ cursor: s-resize;
+ }
+
+.fc-agenda .ui-resizable-resizing { /* TODO: better selector */
+ _overflow: hidden;
+ }
+
+.fc-timeline {
+ position: absolute;
+ width: 100%;
+ left: 0;
+ margin: 0;
+ padding: 0;
+ border: none;
+ border-top: 2px solid #3ec400;
+ z-index: 999;
+}
+
+/* List view (by bruederli at kolabsys.com)
+------------------------------------------------------------------------*/
+
+.fc-view-list,
+.fc-view-table {
+ border: 1px solid #ccc;
+ width: auto;
+}
+
+.fc-view-list .fc-list-header,
+.fc-view-table td.fc-list-header {
+ border-width: 0;
+ border-bottom-width: 1px;
+ padding: 3px 5px;
+}
+
+.fc-view-table .fc-first td.fc-list-header {
+ border-top-width: 0;
+}
+
+.fc-list-section {
+ padding: 4px 2px;
+ border-width: 0;
+ border-bottom-width: 1px;
+}
+
+.fc-view-list .fc-last {
+ border-bottom-width: 0;
+}
+
+.fc-list-section .fc-event {
+ position: relative;
+ margin: 1px 2px 3px 2px;
+}
+
+.fc-view-table tr.fc-event {
+ background: inherit;
+ color: inherit;
+}
+
+.fc-view-table tr.fc-event td {
+ padding: 2px;
+ border-bottom: 1px solid #ccc;
+}
+
+.fc-view-table tr.fc-event td.fc-event-handle {
+ padding: 3px 8px 3px 3px;
+}
+
+.fc-view-table .fc-event-handle .fc-event-skin {
+ border-radius: 2px;
+ -moz-border-radius: 2px;
+}
+
+.fc-view-table .fc-event-handle .fc-event-inner {
+ display: block;
+ width: 8px;
+ height: 10px;
+ border-radius: 2px;
+ -moz-border-radius: 2px;
+}
+
+.fc-view-table table {
+ table-layout: fixed;
+ width: 100%;
+}
+
+.fc-view-table col.fc-event-handle {
+ width: 18px;
+}
+
+.fc-event-handle .fc-event-inner {
+ border-color: inherit;
+ background-color: inherit;
+}
+
+.fc-view-table col.fc-event-date {
+ width: 7em;
+}
+
+.fc-view-table .fc-list-day col.fc-event-date {
+ width: 1px;
+}
+
+.fc-view-table col.fc-event-time {
+ width: 9em;
+}
+
+.fc-view-table td.fc-event-date,
+.fc-view-table td.fc-event-time {
+ white-space: nowrap;
+ padding-right: 1em;
+}
+
diff --git a/plugins/calendar/skins/larry/print.css b/plugins/calendar/skins/larry/print.css
index f332d62..908d760 100644
--- a/plugins/calendar/skins/larry/print.css
+++ b/plugins/calendar/skins/larry/print.css
@@ -130,7 +130,7 @@ body, td, th, div, p, h3, select, input, textarea {
font-style: italic;
}
-div.fc-event-location {
+.fc-event-location {
font-size: 90%;
}
commit d95e90531e8ee73e54dde34f663ac43480597b31
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Tue May 27 09:51:23 2014 +0200
Get localized label from the libcalendaring plugin
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index edcca42..c7be56a 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -325,9 +325,9 @@ class calendar_ui
$attrib['style'] .= 'display:none';
$select_range = new html_select(array('name' => 'listrange', 'id' => 'agenda-listrange'));
- $select_range->add(1 . ' ' . preg_replace('/\(.+\)/', '', $this->cal->gettext('days')), $days);
+ $select_range->add(1 . ' ' . preg_replace('/\(.+\)/', '', $this->cal->lib->gettext('days')), $days);
foreach (array(2,5,7,14,30,60,90) as $days)
- $select_range->add($days . ' ' . preg_replace('/\(|\)/', '', $this->cal->gettext('days')), $days);
+ $select_range->add($days . ' ' . preg_replace('/\(|\)/', '', $this->cal->lib->gettext('days')), $days);
$html .= html::label('agenda-listrange', $this->cal->gettext('listrange'));
$html .= $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults['calendar_agenda_range']));
More information about the commits
mailing list