" +
@@ -259,7 +336,7 @@
+ eventElement = $(triggerRes).appendTo(segContainer);
+ }
+ if (event._id === modifiedEventId) {
-+ bindSeg(event, eventElement, seg);
++ eventElementHandlers(event, eventElement, seg);
+ } else {
+ eventElement[0]._fci = i; // for lazySegBind
+ }
@@ -267,16 +344,47 @@
+ }
+ }
+
-+ lazySegBind(segContainer, seg, bindSeg);
++ lazySegBind(segContainer, seg, eventElementHandlers);
+ }
+
+ markFirstLast(getListContainer());
+ }
+
-+ function bindSeg(event, eventElement, seg) {
-+ eventElementHandlers(event, eventElement);
++ // 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;
@@ -333,15 +441,12 @@
+
+ function render(date, delta) {
+ if (delta) {
-+ addDays(date, delta);
-+ if (!opt('weekends')) {
-+ skipWeekend(date, delta < 0 ? -1 : 1);
-+ }
++ addDays(date, opt('listPage') * delta);
+ }
-+ t.title = opt('listTexts', 'from') + ' ' + formatDate(date, opt('titleFormat'));
+ t.start = t.visStart = cloneDate(date, true);
-+ t.end = addDays(cloneDate(t.start), 1);
-+ t.visEnd = addMonths(cloneDate(t.start), 1); // show events one month ahead. Enough?
++ t.end = addDays(cloneDate(t.start), opt('listPage'));
++ t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
++ t.title = formatDates(date, t.visEnd, opt('titleFormat'));
+
+ updateOptions();
+
@@ -379,6 +484,237 @@
+
+}
+
++
++/* Additional view: table (by bruederli@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) {
++ $('').appendTo(table);
++ }
++ segContainer = $('
').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 += "";
++ for (var col, c=0; c < tableCols.length; c++) {
++ col = tableCols[c];
++ if (col == 'handle') {
++ s += "| " +
++ " " +
++ "" +
++ " | ";
++ } else if (col == 'date') {
++ s += "" + htmlEscape(times[0]) + " | ";
++ } else if (col == 'time') {
++ if (times[1]) {
++ s += "" + htmlEscape(times[1]) + " | ";
++ }
++ } else {
++ s += "" + (htmlEscape(event[col]) || ' ') + " | ";
++ }
++ }
++ s += "
";
++
++ // 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'));
++ t.title = 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 =
++ "" +
++ "";
++ for (var c=0; c < tableCols.length; c++) {
++ s += "";
++ }
++ s += "" +
++ "
";
++ 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