Adam Shaw 8 سال پیش
والد
کامیت
54df601484
1فایلهای تغییر یافته به همراه5 افزوده شده و 5 حذف شده
  1. 5 5
      src/common/Grid.events.js

+ 5 - 5
src/common/Grid.events.js

@@ -1071,23 +1071,23 @@ Grid.mixin({
 	// slices into segments and attaches event-derived properties to them.
 	// slices into segments and attaches event-derived properties to them.
 	// eventSpan - { start, end, isStart, isEnd, otherthings... }
 	// eventSpan - { start, end, isStart, isEnd, otherthings... }
 	eventFootprintToSegs: function(eventFootprint) {
 	eventFootprintToSegs: function(eventFootprint) {
+		var dateRange = eventFootprint.componentFootprint.dateRange;
 		var segs = this.componentFootprintToSegs(eventFootprint.componentFootprint);
 		var segs = this.componentFootprintToSegs(eventFootprint.componentFootprint);
 		var i, seg;
 		var i, seg;
 
 
 		for (i = 0; i < segs.length; i++) {
 		for (i = 0; i < segs.length; i++) {
 			seg = segs[i];
 			seg = segs[i];
 
 
-			// the eventFootprint's isStart/isEnd takes precedence over the seg's
-			if (!eventFootprint.componentFootprint.dateRange.isStart) {
+			if (!dateRange.isStart) {
 				seg.isStart = false;
 				seg.isStart = false;
 			}
 			}
-			if (!eventFootprint.componentFootprint.dateRange.isEnd) {
+			if (!dateRange.isEnd) {
 				seg.isEnd = false;
 				seg.isEnd = false;
 			}
 			}
 
 
 			seg.event = eventFootprint.eventInstance.toLegacy();
 			seg.event = eventFootprint.eventInstance.toLegacy();
-			seg.eventStartMS = +eventFootprint.componentFootprint.dateRange.startMs; // TODO: not the best name after making spans unzoned
-			seg.eventDurationMS = eventFootprint.componentFootprint.dateRange.endMs - eventFootprint.componentFootprint.dateRange.startMs;
+			seg.eventStartMS = dateRange.startMs;
+			seg.eventDurationMS = dateRange.endMs - dateRange.startMs;
 		}
 		}
 
 
 		return segs;
 		return segs;