From b750aec96e4bd50294f61cc39deb47d296559d7c Mon Sep 17 00:00:00 2001
From: "srkenny@gmail.com" <srkenny@gmail.com>
Date: Mon, 12 Aug 2013 17:06:39 +0100
Subject: [PATCH] Resources now work.  Minimising the changes required to core

---
 src/common/DayEventRenderer.js        |   41 +-
 src/resource/ResourceDayView.js       |    1 +
 src/resource/ResourceEventRenderer.js | 1295 +++++++++++++------------
 src/resource/ResourceView.js          |    1 +
 tests/resourceDayView.html            |    4 +-
 5 files changed, 720 insertions(+), 622 deletions(-)

diff --git a/src/common/DayEventRenderer.js b/src/common/DayEventRenderer.js
index cc76bf7..3d49211 100644
--- a/src/common/DayEventRenderer.js
+++ b/src/common/DayEventRenderer.js
@@ -169,6 +169,39 @@ function DayEventRenderer() {
 
 	// Generate an array of "segments" for all events.
 	function buildSegments(events) {
+		var resources = t.getResources;
+		
+		if (resources.length === 0){
+			return buildSegmentsTEMP(events);  // TEMP!
+		} else {
+			var segments = [];
+			for (var i=0; i<resources.length; i++) {
+				var resourceEvents = eventsForResource(resources[i], events);
+
+				for (var j=0; j<resourceEvents.length; j++) {
+					var eventSegments = buildSegmentsForEvent(resourceEvents[j], i);
+					segments.push.apply(segments, eventSegments); // append an array to an array
+
+				}
+			}
+			return segments;
+		}
+	}
+
+	// TODO - move this into more generic area as is a duplicate
+	//Generate an array of "segments" for all events.
+	function eventsForResource(resource, events) {
+    var resourceEvents = [];
+    for (var i = 0; i < events.length; i++) {
+      if (events[i].resource && events[i].resource.indexOf(resource.id) >= 0) {
+        resourceEvents.push(events[i])
+      }
+    }
+    return resourceEvents;
+  }
+
+	// Generate an array of "segments" for all events.
+	function buildSegmentsTEMP(events) {
 		var segments = [];
 		for (var i=0; i<events.length; i++) {
 			var eventSegments = buildSegmentsForEvent(events[i]);
@@ -181,11 +214,17 @@ function DayEventRenderer() {
 	// 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) {
+	function buildSegmentsForEvent(event, col) {
 		var startDate = event.start;
 		var endDate = exclEndDay(event);
 		var segments = rangeToSegments(startDate, endDate);
 		for (var i=0; i<segments.length; i++) {
+			//TEMP
+			if (typeof col !== 'undefined'){
+				segments[i].leftCol = col;
+				segments[i].rightCol = col;
+			}
+			// TEMP
 			segments[i].event = event;
 		}
 		return segments;
diff --git a/src/resource/ResourceDayView.js b/src/resource/ResourceDayView.js
index b1f90e3..66f0561 100644
--- a/src/resource/ResourceDayView.js
+++ b/src/resource/ResourceDayView.js
@@ -22,6 +22,7 @@ function ResourceDayView(element, calendar) {
     t.title = formatDate(date, opt('titleFormat'));
     t.start = t.visStart = start;
     t.end = t.visEnd = end;
+    
     renderResource(getResources.length);
   }
 }
\ No newline at end of file
diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js
index 1833b48..31ec00a 100644
--- a/src/resource/ResourceEventRenderer.js
+++ b/src/resource/ResourceEventRenderer.js
@@ -1,78 +1,184 @@
-function ResourceEventRenderer() {
-  var t = this;
-  // exports
-  t.renderEvents = renderEvents;
-  t.clearEvents = clearEvents;
-  t.slotSegHtml = slotSegHtml;
-  // imports
-  DayEventRenderer.call(t);
-  var opt = t.opt;
-  var trigger = t.trigger;
-  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;
-  var getSlotSegmentContainer = t.getSlotSegmentContainer;
-  var getHoverListener = t.getHoverListener;
-  var getMaxMinute = t.getMaxMinute;
-  var getMinMinute = t.getMinMinute;
-  var timePosition = t.timePosition;
-  var colContentLeft = t.colContentLeft;
-  var colContentRight = t.colContentRight;
-  var cellToDate = t.cellToDate;
-  var segmentCompare = t.segmentCompare;
-  var getColCnt = t.getColCnt;
-  var getColWidth = t.getColWidth;
-  var getSnapHeight = t.getSnapHeight;
-  var getSnapMinutes = t.getSnapMinutes;
-  var getSlotContainer = t.getSlotContainer;
-  var reportEventElement = t.reportEventElement;
-  var showEvents = t.showEvents;
-  var hideEvents = t.hideEvents;
-  var eventDrop = t.eventDrop;
-  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 resources = t.getResources; // imported from ResourceView.js
-  // overrides
-  t.draggableDayEvent = draggableDayEvent;
-  // Rendering
 
-  function renderEvents(events, modifiedEventId) {
-    reportEvents(events);
-    var i, len = events.length,
-      dayEvents = [],
-      slotEvents = [];
-    for (i = 0; i < len; i++) {
-      if (events[i].allDay) {
-        dayEvents.push(events[i]);
-      } else {
-        slotEvents.push(events[i]);
+function ResourceEventRenderer() {
+	var t = this;
+	
+	
+	// exports
+	t.renderEvents = renderEvents;
+	t.clearEvents = clearEvents;
+	t.slotSegHtml = slotSegHtml;
+	
+	
+	// imports
+	DayEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	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;
+	var getSlotSegmentContainer = t.getSlotSegmentContainer;
+	var getHoverListener = t.getHoverListener;
+	var getMaxMinute = t.getMaxMinute;
+	var getMinMinute = t.getMinMinute;
+	var timePosition = t.timePosition;
+	var colContentLeft = t.colContentLeft;
+	var colContentRight = t.colContentRight;
+	var cellToDate = t.cellToDate;
+	var segmentCompare = t.segmentCompare;
+	var getColCnt = t.getColCnt;
+	var getColWidth = t.getColWidth;
+	var getSnapHeight = t.getSnapHeight;
+	var getSnapMinutes = t.getSnapMinutes;
+	var getSlotContainer = t.getSlotContainer;
+	var reportEventElement = t.reportEventElement;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var eventDrop = t.eventDrop;
+	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 resources = t.getResources; // imported from ResourceView.js
+	// overrides
+	t.draggableDayEvent = draggableDayEvent;
+
+	
+	
+	/* Rendering
+	----------------------------------------------------------------------------*/
+	
+
+	function renderEvents(events, modifiedEventId) {
+		reportEvents(events);
+		var i, len=events.length,
+			dayEvents=[],
+			slotEvents=[];
+		for (i=0; i<len; i++) {
+			if (events[i].allDay) {
+				dayEvents.push(events[i]);
+			}else{
+				slotEvents.push(events[i]);
+			}
+		}
+
+		if (opt('allDaySlot')) {
+			renderDayEvents(dayEvents, modifiedEventId);
+      //renderDayEvents(compileDaySegs(dayEvents), modifiedEventId);
+			setHeight(); // no params means set to viewHeight
+		}
+
+		renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
+
+		trigger('eventAfterAllRender');
+	}
+	
+	
+	function clearEvents() {
+		reportEventClear();
+		getDaySegmentContainer().empty();
+		getSlotSegmentContainer().empty();
+	}
+
+	
+	function compileSlotSegs(events) {
+		var colCnt = getColCnt(),
+			minMinute = getMinMinute(),
+			maxMinute = getMaxMinute(),
+			d,
+			visEventEnds = $.map(events, slotEventEnd),
+			i, col,
+			j, level,
+			k, seg,
+			segs = [];
+		for (i=0; i<colCnt; i++) {
+
+			d = cloneDate(t.visStart); //cellToDate(0, i);
+			
+			//d = cellToDate(0, i);
+			addMinutes(d, minMinute);
+
+			// get events for this resource
+			var resourceEvents = eventsForResource(resources[i], events); //$.map(eventsForResource(resources[i], events), slotEventEnd);
+			col = stackAgendaSegs(
+				sliceSegs(
+					resourceEvents, //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);
+				}
+			}
+		}
+		return segs;
+	}
+
+  function eventsForResource(resource, events) {
+    var resourceEvents = [];
+    for (var i = 0; i < events.length; i++) {
+      if (events[i].resource && events[i].resource.indexOf(resource.id) >= 0) {
+        resourceEvents.push(events[i])
       }
     }
-    if (opt('allDaySlot')) {
-      //renderDayEvents(dayEvents, modifiedEventId);
-      renderDayEvents(compileDaySegs(dayEvents), modifiedEventId, resources);
-      setHeight(); // no params means set to viewHeight
-    }
-    renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
-    trigger('eventAfterAllRender');
-  }
-
-  function clearEvents() {
-    reportEventClear();
-    getDaySegmentContainer().empty();
-    getSlotSegmentContainer().empty();
+    return resourceEvents;
   }
 
+	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(segmentCompare);
+	}
+	
+  // event rendering calculation utilities
   function compileDaySegs(events) {
     var levels = stackSegs(sliceSegs(events, $.map(events, exclEndDay), t.visStart, t.visEnd)),
       i, levelCnt = levels.length,
@@ -90,87 +196,6 @@ function ResourceEventRenderer() {
     }
     return segs;
   }
-
-  function compileSlotSegs(events) {
-    //var colCnt = getColCnt(),
-    var minMinute = getMinMinute(),
-      maxMinute = getMaxMinute(),
-      d = addMinutes(cloneDate(t.visStart), minMinute),
-      visEventEnds = $.map(events, slotEventEnd),
-      i, col,
-      j, level,
-      k, seg,
-      segs = [];
-    for (i = 0; i < resources.length; i++) {
-      //d = cellToDate(0, i);
-      //addMinutes(d, minMinute);
-      // get events for this resource
-      var resourceEvents = eventsForResource(resources[i], events);
-      col = stackAgendaSegs(sliceSegs(resourceEvents, $.map(resourceEvents, slotEventEnd), 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);
-        }
-      }
-    }
-    return segs;
-  }
-
-  function eventsForResource(resource, events) {
-    var resourceEvents = [];
-    for (var i = 0; i < events.length; i++) {
-      if (events[i].resource && events[i].resource.indexOf(resource.id) >= 0) {
-        resourceEvents.push(events[i])
-      }
-    }
-    return resourceEvents;
-  }
-
-  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(segmentCompare);
-  }
-  // event rendering calculation utilities
-
   function stackSegs(segs) {
     var levels = [],
       i, len = segs.length,
@@ -204,482 +229,514 @@ function ResourceEventRenderer() {
     return levels;
   }
 
-  function slotEventEnd(event) {
-    if (event.end) {
-      return cloneDate(event.end);
-    } else {
-      return addMinutes(cloneDate(event.start), opt('defaultEventMinutes'));
-    }
-  }
-  // 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 slotEventEnd(event) {
+		if (event.end) {
+			return cloneDate(event.end);
+		}else{
+			return addMinutes(cloneDate(event.start), opt('defaultEventMinutes'));
+		}
+	}
+	
+	
+	// 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,
+			left,
+			html='',
+			eventElements,
+			eventElement,
+			triggerRes,
+			titleElement,
+			height,
+			slotSegmentContainer = getSlotSegmentContainer(),
+			rtl, dis;
+			
+		if (rtl = opt('isRTL')) {
+			dis = -1;
+		}else{
+			dis = 1;
+		}
+			
+		// calculate position/dimensions, create html
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			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);
+			availWidth = colContentRight(colI) - 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) {
+					// moderately wide, aligned left still
+					outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
+				}else{
+					// can be entire width, aligned left
+					outerWidth = availWidth;
+				}
+			}
+			left = leftmost +                                  // leftmost possible
+				(availWidth / (levelI + forward + 1) * levelI) // indentation
+				* dis + (rtl ? availWidth - outerWidth : 0);   // rtl
+			seg.top = top;
+			seg.left = left;
+			seg.outerWidth = outerWidth;
+			seg.outerHeight = bottom - top;
+			html += slotSegHtml(event, seg);
+		}
+		slotSegmentContainer[0].innerHTML = html; // faster than html()
+		eventElements = slotSegmentContainer.children();
+		
+		// retrieve elements, run through eventRender callback, bind event handlers
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			event = seg.event;
+			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)
+						.css({
+							position: 'absolute',
+							top: seg.top,
+							left: seg.left
+						})
+						.appendTo(slotSegmentContainer);
+				}
+				seg.element = eventElement;
+				if (event._id === modifiedEventId) {
+					bindSlotSeg(event, eventElement, seg);
+				}else{
+					eventElement[0]._fci = i; // for lazySegBind
+				}
+				reportEventElement(event, eventElement);
+			}
+		}
+		
+		lazySegBind(slotSegmentContainer, segs, bindSlotSeg);
+		
+		// record event sides and title positions
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			if (eventElement = seg.element) {
+				seg.vsides = vsides(eventElement, true);
+				seg.hsides = hsides(eventElement, true);
+				titleElement = eventElement.find('.fc-event-title');
+				if (titleElement.length) {
+					seg.contentTop = titleElement[0].offsetTop;
+				}
+			}
+		}
+		
+		// set all positions/dimensions at once
+		for (i=0; i<segCnt; i++) {
+			seg = segs[i];
+			if (eventElement = seg.element) {
+				eventElement[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
+				height = Math.max(0, seg.outerHeight - seg.vsides);
+				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 (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')
+						.remove();
+				}
+				trigger('eventAfterRender', event, event, eventElement);
+			}
+		}
+					
+	}
+	
+	
+	function slotSegHtml(event, seg) {
+		var html = "<";
+		var url = event.url;
+		var skinCss = getSkinCss(event, opt);
+		var classes = ['fc-event', 'fc-event-vert'];
+		if (isEventDraggable(event)) {
+			classes.push('fc-event-draggable');
+		}
+		if (seg.isStart) {
+			classes.push('fc-event-start');
+		}
+		if (seg.isEnd) {
+			classes.push('fc-event-end');
+		}
+		classes = classes.concat(event.className);
+		if (event.source) {
+			classes = classes.concat(event.source.className || []);
+		}
+		if (url) {
+			html += "a href='" + htmlEscape(event.url) + "'";
+		}else{
+			html += "div";
+		}
+		html +=
+			" class='" + classes.join(' ') + "'" +
+			" style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px;" + skinCss + "'" +
+			">" +
+			"<div class='fc-event-inner'>" +
+			"<div class='fc-event-time'>" +
+			htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
+			"</div>" +
+			"<div class='fc-event-title'>" +
+			htmlEscape(event.title) +
+			"</div>" +
+			"</div>" +
+			"<div class='fc-event-bg'></div>";
+		if (seg.isEnd && isEventResizable(event)) {
+			html +=
+				"<div class='ui-resizable-handle ui-resizable-s'>=</div>";
+		}
+		html +=
+			"</" + (url ? "a" : "div") + ">";
+		return html;
+	}
+	
+	
+	function bindSlotSeg(event, eventElement, seg) {
+		var timeElement = eventElement.find('div.fc-event-time');
+		if (isEventDraggable(event)) {
+			draggableSlotEvent(event, eventElement, timeElement);
+		}
+		if (seg.isEnd && isEventResizable(event)) {
+			resizableSlotEvent(event, eventElement, timeElement);
+		}
+		eventElementHandlers(event, eventElement);
+	}
+	
+	
+	
+	/* Dragging
+	-----------------------------------------------------------------------------------*/
+	
+	
+	// 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, seg) {
+		var isStart = seg.isStart;
+		var origWidth;
+		var revert;
+		var allDay = true;
+		var dayDelta;
+		var hoverListener = getHoverListener();
+		var colWidth = getColWidth();
+		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) {
+					clearOverlays();
+					if (cell) {
+						revert = false;
+						var origDate = cellToDate(0, origCell.col);
+						var date = cellToDate(0, cell.col);
+						dayDelta = dayDiff(date, origDate);
+						if (!cell.row) {
+							// on full-days
+							renderDayOverlay(
+								addDays(cloneDate(event.start), dayDelta),
+								addDays(exclEndDay(event), dayDelta)
+							);
+							resetElement();
+						}else{
+							// mouse is over bottom slots
+							if (isStart) {
+								if (allDay) {
+									// convert event to temporary slot-event
+									eventElement.width(colWidth - 10); // don't use entire width
+									setOuterHeight(
+										eventElement,
+										snapHeight * Math.round(
+											(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes')) /
+												snapMinutes
+										)
+									);
+									eventElement.draggable('option', 'grid', [colWidth, 1]);
+									allDay = false;
+								}
+							}else{
+								revert = true;
+							}
+						}
+						revert = revert || (allDay && !dayDelta);
+					}else{
+						resetElement();
+						revert = true;
+					}
+					eventElement.draggable('option', 'revert', revert);
+				}, ev, 'drag');
+			},
+			stop: function(ev, ui) {
+				hoverListener.stop();
+				clearOverlays();
+				trigger('eventDragStop', eventElement, event, ev, ui);
+				if (revert) {
+					// hasn't moved or is out of bounds (draggable has already reverted)
+					resetElement();
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					showEvents(event, eventElement);
+				}else{
+					// changed!
+					var minuteDelta = 0;
+					if (!allDay) {
+						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);
+				}
+			}
+		});
+		function resetElement() {
+			if (!allDay) {
+				eventElement
+					.width(origWidth)
+					.height('')
+					.draggable('option', 'grid', null);
+				allDay = true;
+			}
+		}
+	}
+	
+	
+	// when event starts out IN TIMESLOTS
+	
+	function draggableSlotEvent(event, eventElement, timeElement) {
+		var origPosition;
+		var allDay = false;
+		var dayDelta;
+		var minuteDelta;
+		var prevMinuteDelta;
+		var hoverListener = getHoverListener();
+		var colCnt = getColCnt();
+		var colWidth = getColWidth();
+		var snapHeight = getSnapHeight();
+		var snapMinutes = getSnapMinutes();
+		eventElement.draggable({
+			zIndex: 9,
+			scroll: false,
+			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);
+				origPosition = eventElement.position();
+				minuteDelta = prevMinuteDelta = 0;
+				hoverListener.start(function(cell, origCell) {
+					eventElement.draggable('option', 'revert', !cell);
+					clearOverlays();
+					if (cell) {
+						var origDate = cellToDate(0, origCell.col);
+						var date = cellToDate(0, cell.col);
+						dayDelta = dayDiff(date, origDate);
+						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) / snapHeight) * snapMinutes;
+				if (minuteDelta != prevMinuteDelta) {
+					if (!allDay) {
+						updateTimeText(minuteDelta);
+					}
+					prevMinuteDelta = minuteDelta;
+				}
+			},
+			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();
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position
+					updateTimeText(0);
+					showEvents(event, eventElement);
+				}
+			}
+		});
+		function updateTimeText(minuteDelta) {
+			var newStart = addMinutes(cloneDate(event.start), minuteDelta);
+			var newEnd;
+			if (event.end) {
+				newEnd = addMinutes(cloneDate(event.end), minuteDelta);
+			}
+			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, snapHeight]);
+				allDay = false;
+			}
+		}
+	}
+	
+	
+	
+	/* Resizing
+	--------------------------------------------------------------------------------------*/
+	
+	
+	function resizableSlotEvent(event, eventElement, timeElement) {
+		var snapDelta, prevSnapDelta;
+		var snapHeight = getSnapHeight();
+		var snapMinutes = getSnapMinutes();
+		eventElement.resizable({
+			handles: {
+				s: '.ui-resizable-handle'
+			},
+			grid: snapHeight,
+			start: function(ev, ui) {
+				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
+				snapDelta = Math.round((Math.max(snapHeight, eventElement.height()) - ui.originalSize.height) / snapHeight);
+				if (snapDelta != prevSnapDelta) {
+					timeElement.text(
+						formatDates(
+							event.start,
+							(!snapDelta && !event.end) ? null : // no change, so don't display time range
+								addMinutes(eventEnd(event), snapMinutes*snapDelta),
+							opt('timeFormat')
+						)
+					);
+					prevSnapDelta = snapDelta;
+				}
+			},
+			stop: function(ev, ui) {
+				trigger('eventResizeStop', this, event, 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
+				}
+			}
+		});
+	}
+	
 
-  function renderSlotSegs(segs, modifiedEventId) {
-    var i, segCnt = segs.length,
-      seg,
-      event,
-      classes,
-      top, bottom,
-      colI, levelI, forward,
-      leftmost,
-      availWidth,
-      outerWidth,
-      left,
-      html = '',
-      eventElements,
-      eventElement,
-      triggerRes,
-      titleElement,
-      height,
-      slotSegmentContainer = getSlotSegmentContainer(),
-      rtl, dis;
-    if (rtl = opt('isRTL')) {
-      dis = -1;
-    } else {
-      dis = 1;
-    }
-    // calculate position/dimensions, create html
-    for (i = 0; i < segCnt; i++) {
-      seg = segs[i];
-      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);
-      availWidth = colContentRight(colI) - 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) {
-          // moderately wide, aligned left still
-          outerWidth = ((availWidth / (forward + 1)) - (12 / 2)) * 2; // 12 is the predicted width of resizer =
-        } else {
-          // can be entire width, aligned left
-          outerWidth = availWidth;
-        }
-      }
-      left = leftmost + // leftmost possible
-      (availWidth / (levelI + forward + 1) * levelI) // indentation
-      * dis + (rtl ? availWidth - outerWidth : 0); // rtl
-      seg.top = top;
-      seg.left = left;
-      seg.outerWidth = outerWidth;
-      seg.outerHeight = bottom - top;
-      html += slotSegHtml(event, seg);
-    }
-    slotSegmentContainer[0].innerHTML = html; // faster than html()
-    eventElements = slotSegmentContainer.children();
-    // retrieve elements, run through eventRender callback, bind event handlers
-    for (i = 0; i < segCnt; i++) {
-      seg = segs[i];
-      event = seg.event;
-      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)
-            .css({
-              position: 'absolute',
-              top: seg.top,
-              left: seg.left
-            })
-            .appendTo(slotSegmentContainer);
-        }
-        seg.element = eventElement;
-        if (event._id === modifiedEventId) {
-          bindSlotSeg(event, eventElement, seg);
-        } else {
-          eventElement[0]._fci = i; // for lazySegBind
-        }
-        reportEventElement(event, eventElement);
-      }
-    }
-    lazySegBind(slotSegmentContainer, segs, bindSlotSeg);
-    // record event sides and title positions
-    for (i = 0; i < segCnt; i++) {
-      seg = segs[i];
-      if (eventElement = seg.element) {
-        seg.vsides = vsides(eventElement, true);
-        seg.hsides = hsides(eventElement, true);
-        titleElement = eventElement.find('.fc-event-title');
-        if (titleElement.length) {
-          seg.contentTop = titleElement[0].offsetTop;
-        }
-      }
-    }
-    // set all positions/dimensions at once
-    for (i = 0; i < segCnt; i++) {
-      seg = segs[i];
-      if (eventElement = seg.element) {
-        eventElement[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
-        height = Math.max(0, seg.outerHeight - seg.vsides);
-        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 (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')
-            .remove();
-        }
-        trigger('eventAfterRender', event, event, eventElement);
-      }
-    }
-  }
+}
 
-  function slotSegHtml(event, seg) {
-    var html = "<";
-    var url = event.url;
-    var skinCss = getSkinCss(event, opt);
-    var classes = ['fc-event', 'fc-event-vert'];
-    if (isEventDraggable(event)) {
-      classes.push('fc-event-draggable');
-    }
-    if (seg.isStart) {
-      classes.push('fc-event-start');
-    }
-    if (seg.isEnd) {
-      classes.push('fc-event-end');
-    }
-    classes = classes.concat(event.className);
-    if (event.source) {
-      classes = classes.concat(event.source.className || []);
-    }
-    if (url) {
-      html += "a href='" + htmlEscape(event.url) + "'";
-    } else {
-      html += "div";
-    }
-    html +=
-      " class='" + classes.join(' ') + "'" +
-      " style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px;" + skinCss + "'" +
-      ">" +
-      "<div class='fc-event-inner'>" +
-      "<div class='fc-event-time'>" +
-      htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
-      "</div>" +
-      "<div class='fc-event-title'>" +
-      htmlEscape(event.title) +
-      "</div>" +
-      "</div>" +
-      "<div class='fc-event-bg'></div>";
-    if (seg.isEnd && isEventResizable(event)) {
-      html +=
-        "<div class='ui-resizable-handle ui-resizable-s'>=</div>";
-    }
-    html +=
-      "</" + (url ? "a" : "div") + ">";
-    return html;
-  }
 
-  function bindSlotSeg(event, eventElement, seg) {
-    var timeElement = eventElement.find('div.fc-event-time');
-    if (isEventDraggable(event)) {
-      draggableSlotEvent(event, eventElement, timeElement);
-    }
-    if (seg.isEnd && isEventResizable(event)) {
-      resizableSlotEvent(event, eventElement, timeElement);
-    }
-    eventElementHandlers(event, eventElement);
-  }
-  /* Dragging
-  -----------------------------------------------------------------------------------*/
-  // 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, seg) {
-    var isStart = seg.isStart;
-    var origWidth;
-    var revert;
-    var allDay = true;
-    var dayDelta;
-    var hoverListener = getHoverListener();
-    var colWidth = getColWidth();
-    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) {
-          clearOverlays();
-          if (cell) {
-            revert = false;
-            var origDate = cellToDate(0, origCell.col);
-            var date = cellToDate(0, cell.col);
-            dayDelta = dayDiff(date, origDate);
-            if (!cell.row) {
-              // on full-days
-              renderDayOverlay(
-                addDays(cloneDate(event.start), dayDelta),
-                addDays(exclEndDay(event), dayDelta)
-              );
-              resetElement();
-            } else {
-              // mouse is over bottom slots
-              if (isStart) {
-                if (allDay) {
-                  // convert event to temporary slot-event
-                  eventElement.width(colWidth - 10); // don't use entire width
-                  setOuterHeight(
-                    eventElement,
-                    snapHeight * Math.round(
-                      (event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes')) /
-                      snapMinutes
-                    )
-                  );
-                  eventElement.draggable('option', 'grid', [colWidth, 1]);
-                  allDay = false;
-                }
-              } else {
-                revert = true;
-              }
-            }
-            revert = revert || (allDay && !dayDelta);
-          } else {
-            resetElement();
-            revert = true;
-          }
-          eventElement.draggable('option', 'revert', revert);
-        }, ev, 'drag');
-      },
-      stop: function (ev, ui) {
-        hoverListener.stop();
-        clearOverlays();
-        trigger('eventDragStop', eventElement, event, ev, ui);
-        if (revert) {
-          // hasn't moved or is out of bounds (draggable has already reverted)
-          resetElement();
-          eventElement.css('filter', ''); // clear IE opacity side-effects
-          showEvents(event, eventElement);
-        } else {
-          // changed!
-          var minuteDelta = 0;
-          if (!allDay) {
-            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);
-        }
-      }
-    });
+/* Agenda Event Segment Utilities
+-----------------------------------------------------------------------------*/
+// TODO: maybe somehow consolidate this with DayEventRenderer's segment system
 
-    function resetElement() {
-      if (!allDay) {
-        eventElement
-          .width(origWidth)
-          .height('')
-          .draggable('option', 'grid', null);
-        allDay = true;
-      }
-    }
-  }
-  // when event starts out IN TIMESLOTS
 
-  function draggableSlotEvent(event, eventElement, timeElement) {
-    var origPosition;
-    var allDay = false;
-    var dayDelta;
-    var minuteDelta;
-    var prevMinuteDelta;
-    var hoverListener = getHoverListener();
-    var colCnt = getColCnt();
-    var colWidth = getColWidth();
-    var snapHeight = getSnapHeight();
-    var snapMinutes = getSnapMinutes();
-    eventElement.draggable({
-      zIndex: 9,
-      scroll: false,
-      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);
-        origPosition = eventElement.position();
-        minuteDelta = prevMinuteDelta = 0;
-        hoverListener.start(function (cell, origCell) {
-          eventElement.draggable('option', 'revert', !cell);
-          clearOverlays();
-          if (cell) {
-            var origDate = cellToDate(0, origCell.col);
-            var date = cellToDate(0, cell.col);
-            dayDelta = dayDiff(date, origDate);
-            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) / snapHeight) * snapMinutes;
-        if (minuteDelta != prevMinuteDelta) {
-          if (!allDay) {
-            updateTimeText(minuteDelta);
-          }
-          prevMinuteDelta = minuteDelta;
-        }
-      },
-      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();
-          eventElement.css('filter', ''); // clear IE opacity side-effects
-          eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position
-          updateTimeText(0);
-          showEvents(event, eventElement);
-        }
-      }
-    });
+function stackAgendaSegs(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 (agendaSegsCollide(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;
+}
 
-    function updateTimeText(minuteDelta) {
-      var newStart = addMinutes(cloneDate(event.start), minuteDelta);
-      var newEnd;
-      if (event.end) {
-        newEnd = addMinutes(cloneDate(event.end), minuteDelta);
-      }
-      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, snapHeight]);
-        allDay = false;
-      }
-    }
-  }
-  /* Resizing
-  --------------------------------------------------------------------------------------*/
+function countForwardSegs(levels) {
+	var i, j, k, level, segForward, segBack;
+	for (i=levels.length-1; i>0; 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 (agendaSegsCollide(segForward, segBack)) {
+					segBack.forward = Math.max(segBack.forward||0, (segForward.forward||0)+1);
+				}
+			}
+		}
+	}
+}
 
-  function resizableSlotEvent(event, eventElement, timeElement) {
-    var snapDelta, prevSnapDelta;
-    var snapHeight = getSnapHeight();
-    var snapMinutes = getSnapMinutes();
-    eventElement.resizable({
-      handles: {
-        s: '.ui-resizable-handle'
-      },
-      grid: snapHeight,
-      start: function (ev, ui) {
-        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
-        snapDelta = Math.round((Math.max(snapHeight, eventElement.height()) - ui.originalSize.height) / snapHeight);
-        if (snapDelta != prevSnapDelta) {
-          timeElement.text(
-            formatDates(
-              event.start, (!snapDelta && !event.end) ? null : // no change, so don't display time range
-              addMinutes(eventEnd(event), snapMinutes * snapDelta),
-              opt('timeFormat')
-            )
-          );
-          prevSnapDelta = snapDelta;
-        }
-      },
-      stop: function (ev, ui) {
-        trigger('eventResizeStop', this, event, 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
-        }
-      }
-    });
-  }
-  /* Agenda Event Segment Utilities
-  -----------------------------------------------------------------------------*/
-  // TODO: maybe somehow consolidate this with DayEventRenderer's segment system
 
-  function stackAgendaSegs(segs) {
-    var levels = [],
-      len = segs.length,
-      seg, j, collide, k;
-    for (var 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 (agendaSegsCollide(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;
-  }
+function agendaSegsCollide(seg1, seg2) {
+	return seg1.end > seg2.start && seg1.start < seg2.end;
+}
 
-  function countForwardSegs(levels) {
-    var i, j, k, level, segForward, segBack;
-    for (i = levels.length - 1; i > 0; 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 (agendaSegsCollide(segForward, segBack)) {
-            segBack.forward = Math.max(segBack.forward || 0, (segForward.forward || 0) + 1);
-          }
-        }
-      }
-    }
-  }
-
-  function agendaSegsCollide(seg1, seg2) {
-    return seg1.end > seg2.start && seg1.start < seg2.end;
-  }
-}
\ No newline at end of file
diff --git a/src/resource/ResourceView.js b/src/resource/ResourceView.js
index e31f661..3318950 100644
--- a/src/resource/ResourceView.js
+++ b/src/resource/ResourceView.js
@@ -123,6 +123,7 @@ function ResourceView(element, calendar, viewName) {
   disableTextSelection(element.addClass('fc-agenda'));
 
   function renderResource(c) {
+    colCnt = c;
     updateOptions();
     if (!dayTable) {
       buildSkeleton(); // builds day table, slot area, events containers
diff --git a/tests/resourceDayView.html b/tests/resourceDayView.html
index 880a095..4d9077c 100644
--- a/tests/resourceDayView.html
+++ b/tests/resourceDayView.html
@@ -82,7 +82,7 @@
 	<script src='../src/agenda/AgendaWeekView.js'></script>
 	<script src='../src/agenda/AgendaDayView.js'></script>
 	<script src='../src/agenda/AgendaView.js'></script>
-	<script src='../src/agenda/AgendaEventRenderer.js'></script>
+	<!-- <script src='../src/agenda/AgendaEventRenderer.js'></script>-->
 	<script src='../src/resource/ResourceDayView.js'></script>
 	<script src='../src/resource/ResourceView.js'></script>
 	<script src='../src/resource/ResourceEventRenderer.js'></script>
@@ -141,7 +141,7 @@
 					{
 						title: 'R2: Meeting 11.00',
 						start: new Date(y, m, d, 11, 00),
-						allDay: false,
+						allDay: true,
 						resource: 'resource2'
 					},
 					{