dateRange -> unzonedRange

src/Calendar.constraints.js

@@ -273,7 +273,7 @@ Calendar.prototype.eventRangeToEventFootprints = function(eventRange) {
 	return [
 		new EventFootprint(
 			new ComponentFootprint(
-				eventRange.dateRange,
+				eventRange.unzonedRange,
 				eventRange.eventDef.isAllDay()
 			),
 			eventRange.eventDef,
@@ -289,13 +289,13 @@ Calendar.prototype.eventRangeToEventFootprints = function(eventRange) {
 
 Calendar.prototype.footprintContainsFootprint = function(outerFootprint, innerFootprint) {
 	// TODO: use date range utils
-	return innerFootprint.dateRange.startMs >= outerFootprint.dateRange.startMs &&
-		innerFootprint.dateRange.endMs <= outerFootprint.dateRange.endMs;
+	return innerFootprint.unzonedRange.startMs >= outerFootprint.unzonedRange.startMs &&
+		innerFootprint.unzonedRange.endMs <= outerFootprint.unzonedRange.endMs;
 };
 
 
 Calendar.prototype.footprintsIntersect = function(footprint0, footprint1) {
 	// TODO: use date range utils
-	return footprint0.dateRange.startMs < footprint1.dateRange.endMs &&
-		footprint0.dateRange.endMs > footprint1.dateRange.startMs;
+	return footprint0.unzonedRange.startMs < footprint1.unzonedRange.endMs &&
+		footprint0.unzonedRange.endMs > footprint1.unzonedRange.startMs;
 };

src/Calendar.moment.js

@@ -134,11 +134,11 @@ Calendar.mixin({
 
 
 	footprintToDateProfile: function(componentFootprint, ignoreEnd) {
-		var start = FC.moment.utc(componentFootprint.dateRange.startMs);
+		var start = FC.moment.utc(componentFootprint.unzonedRange.startMs);
 		var end;
 
 		if (!ignoreEnd) {
-			end = FC.moment.utc(componentFootprint.dateRange.endMs);
+			end = FC.moment.utc(componentFootprint.unzonedRange.endMs);
 		}
 
 		if (componentFootprint.isAllDay) {

src/common/DayGrid.js

@@ -224,7 +224,7 @@ var DayGrid = FC.DayGrid = Grid.extend(DayTableMixin, {
 
 	// Slices up the given span (unzoned start/end with other misc data) into an array of segments
 	componentFootprintToSegs: function(componentFootprint) {
-		var segs = this.sliceRangeByRow(componentFootprint.dateRange.getRange());
+		var segs = this.sliceRangeByRow(componentFootprint.unzonedRange.getRange());
 		var i, seg;
 
 		for (i = 0; i < segs.length; i++) {

src/common/Grid.events.js

@@ -497,8 +497,8 @@ Grid.mixin({
 
 	// DOES NOT consider overlap/constraint
 	computeEventDropMutation: function(startFootprint, endFootprint) {
-		var date0 = startFootprint.dateRange.getStart();
-		var date1 = endFootprint.dateRange.getStart();
+		var date0 = startFootprint.unzonedRange.getStart();
+		var date1 = endFootprint.unzonedRange.getStart();
 		var clearEnd = false;
 		var forceTimed = false;
 		var forceAllDay = false;
@@ -650,7 +650,7 @@ Grid.mixin({
 	// DOES NOT consider overlap/constraint.
 	computeExternalDrop: function(componentFootprint, meta) {
 		var calendar = this.view.calendar;
-		var start = FC.moment.utc(componentFootprint.dateRange.startMs).stripZone();
+		var start = FC.moment.utc(componentFootprint.unzonedRange.startMs).stripZone();
 		var end;
 		var eventDef;
 
@@ -827,8 +827,8 @@ Grid.mixin({
 	// Returns new date-information for an event segment being resized from its start
 	computeEventStartResizeMutation: function(startFootprint, endFootprint, event) {
 		var startDelta = this.diffDates(
-			endFootprint.dateRange.getStart(),
-			startFootprint.dateRange.getStart()
+			endFootprint.unzonedRange.getStart(),
+			startFootprint.unzonedRange.getStart()
 		);
 		var eventEnd = this.view.calendar.getEventEnd(event);
 		var dateMutation;
@@ -852,8 +852,8 @@ Grid.mixin({
 	// Returns new date-information for an event segment being resized from its end
 	computeEventEndResizeMutation: function(startFootprint, endFootprint, event) {
 		var endDelta = this.diffDates(
-			endFootprint.dateRange.getEnd(),
-			startFootprint.dateRange.getEnd()
+			endFootprint.unzonedRange.getEnd(),
+			startFootprint.unzonedRange.getEnd()
 		);
 		var eventEnd = this.view.calendar.getEventEnd(event);
 		var dateMutation;
@@ -1028,7 +1028,7 @@ Grid.mixin({
 		for (i = 0; i < eventFootprints.length; i++) {
 			if (
 				!isRangeWithinRange(
-					eventFootprints[i].componentFootprint.dateRange.getRange(),
+					eventFootprints[i].componentFootprint.unzonedRange.getRange(),
 					this.view.validRange
 				)
 			) {
@@ -1049,7 +1049,7 @@ Grid.mixin({
 		for (i = 0; i < eventFootprints.length; i++) {
 			if (
 				!isRangeWithinRange(
-					eventFootprints[i].componentFootprint.dateRange.getRange(),
+					eventFootprints[i].componentFootprint.unzonedRange.getRange(),
 					this.view.validRange
 				)
 			) {
@@ -1094,7 +1094,7 @@ Grid.mixin({
 		return [
 			new EventFootprint(
 				new ComponentFootprint(
-					eventRange.dateRange,
+					eventRange.unzonedRange,
 					eventRange.eventDef.isAllDay()
 				),
 				eventRange.eventDef,
@@ -1123,12 +1123,12 @@ Grid.mixin({
 	// eventSpan - { start, end, isStart, isEnd, otherthings... }
 	// constraintRange allow additional clipping. optional.
 	eventFootprintToSegs: function(eventFootprint, constraintRange) {
-		var dateRange = eventFootprint.componentFootprint.dateRange;
+		var unzonedRange = eventFootprint.componentFootprint.unzonedRange;
 		var segs;
 		var i, seg;
 
 		if (constraintRange) {
-			dateRange = dateRange.constrainTo(constraintRange);
+			unzonedRange = unzonedRange.constrainTo(constraintRange);
 		}
 
 		segs = this.componentFootprintToSegs(eventFootprint.componentFootprint);
@@ -1136,17 +1136,17 @@ Grid.mixin({
 		for (i = 0; i < segs.length; i++) {
 			seg = segs[i];
 
-			if (!dateRange.isStart) {
+			if (!unzonedRange.isStart) {
 				seg.isStart = false;
 			}
-			if (!dateRange.isEnd) {
+			if (!unzonedRange.isEnd) {
 				seg.isEnd = false;
 			}
 
 			seg.event = eventFootprint.toLegacy();
 			seg.footprint = eventFootprint;
-			seg.footprintStartMs = dateRange.startMs;
-			seg.footprintDurationMs = dateRange.endMs - dateRange.startMs;
+			seg.footprintStartMs = unzonedRange.startMs;
+			seg.footprintDurationMs = unzonedRange.endMs - unzonedRange.startMs;
 		}
 
 		return segs;

src/common/Grid.js

@@ -180,7 +180,7 @@ var Grid = FC.Grid = ChronoComponent.extend({
 
 		if (
 			!isRangeWithinRange(
-				footprint.dateRange.getRange(),
+				footprint.unzonedRange.getRange(),
 				this.view.activeRange
 			)
 		) {
@@ -514,10 +514,10 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	// TODO: do this separation of concerns (combining VS validation) for event dnd/resize too.
 	computeSelectionFootprint: function(footprint0, footprint1) {
 		var ms = [
-			footprint0.dateRange.startMs,
-			footprint0.dateRange.endMs,
-			footprint1.dateRange.startMs,
-			footprint1.dateRange.endMs
+			footprint0.unzonedRange.startMs,
+			footprint0.unzonedRange.endMs,
+			footprint1.unzonedRange.startMs,
+			footprint1.unzonedRange.endMs
 		];
 
 		ms.sort(compareNumbers);
@@ -531,7 +531,7 @@ var Grid = FC.Grid = ChronoComponent.extend({
 
 	isSelectionFootprintAllowed: function(componentFootprint) {
 		return isRangeWithinRange(
-			componentFootprint.dateRange.getRange(),
+			componentFootprint.unzonedRange.getRange(),
 			this.view.validRange
 		) &&
 		this.view.calendar.isSelectionFootprintAllowed(componentFootprint);

src/common/TimeGrid.js

@@ -255,7 +255,7 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 
 	// Slices up the given span (unzoned start/end with other misc data) into an array of segments
 	componentFootprintToSegs: function(componentFootprint) {
-		var segs = this.sliceRangeByTimes(componentFootprint.dateRange.getRange());
+		var segs = this.sliceRangeByTimes(componentFootprint.unzonedRange.getRange());
 		var i;
 
 		for (i = 0; i < segs.length; i++) {

src/common/View.js

@@ -837,8 +837,8 @@ var View = FC.View = ChronoComponent.extend({
 	// Triggers handlers to 'select'
 	triggerSelect: function(footprint, ev) {
 		var calendar = this.calendar;
-		var start = calendar.moment(footprint.dateRange.getStart());
-		var end = calendar.moment(footprint.dateRange.getEnd());
+		var start = calendar.moment(footprint.unzonedRange.getStart());
+		var end = calendar.moment(footprint.unzonedRange.getEnd());
 
 		if (footprint.isAllDay) {
 			start.stripTime();
@@ -944,7 +944,7 @@ var View = FC.View = ChronoComponent.extend({
 	// Triggers handlers to 'dayClick'
 	// Span has start/end of the clicked area. Only the start is useful.
 	triggerDayClick: function(footprint, dayEl, ev) {
-		var date = this.calendar.moment(footprint.dateRange.getStart()); // need the calendar's timezone
+		var date = this.calendar.moment(footprint.unzonedRange.getStart()); // need the calendar's timezone
 
 		if (footprint.isAllDay) {
 			date.stripTime();

src/list/ListView.js

@@ -75,7 +75,7 @@ var ListViewGrid = Grid.extend({
 
 		while (dayStart < view.renderRange.end) {
 
-			seg = intersectRanges(footprint.dateRange.getRange(), {
+			seg = intersectRanges(footprint.unzonedRange.getRange(), {
 				start: dayStart,
 				end: dayStart.clone().add(1, 'day')
 			});
@@ -92,9 +92,9 @@ var ListViewGrid = Grid.extend({
 			// and mutate the latest seg to the be the end.
 			if (
 				seg && !seg.isEnd && !footprint.isAllDay &&
-				footprint.dateRange.getEnd() < dayStart.clone().add(view.nextDayThreshold)
+				footprint.unzonedRange.getEnd() < dayStart.clone().add(view.nextDayThreshold)
 			) {
-				seg.end = footprint.dateRange.getEnd();
+				seg.end = footprint.unzonedRange.getEnd();
 				seg.isEnd = true;
 				break;
 			}

src/models/ComponentFootprint.js

@@ -1,26 +1,26 @@
 
 var ComponentFootprint = Class.extend({
 
-	dateRange: null,
+	unzonedRange: null,
 	isAllDay: false,
 
 
-	constructor: function(dateRange, isAllDay) {
-		this.dateRange = dateRange;
+	constructor: function(unzonedRange, isAllDay) {
+		this.unzonedRange = unzonedRange;
 		this.isAllDay = isAllDay;
 	},
 
 
 	toLegacy: function() {
-		return this.dateRange.getRange();
+		return this.unzonedRange.getRange();
 	}
 
 });
 
 
 function convertFootprintToLegacySelection(footprint, calendar) {
-	var start = calendar.moment(footprint.dateRange.startMs);
-	var end = calendar.moment(footprint.dateRange.endMs);
+	var start = calendar.moment(footprint.unzonedRange.startMs);
+	var end = calendar.moment(footprint.unzonedRange.endMs);
 
 	if (footprint.isAllDay) {
 		start.stripTime();

src/models/UnzonedRange.js

@@ -55,17 +55,17 @@ var UnzonedRange = Class.extend({
 SIDEEFFECT: will mutate eventRanges.
 Will return a new array result.
 */
-function invertDateRanges(dateRanges, constraintRange) {
+function invertUnzonedRanges(ranges, constraintRange) {
 	var invertedRanges = [];
 	var startMs = constraintRange.startMs; // the end of the previous range. the start of the new range
 	var i;
 	var dateRange;
 
 	// ranges need to be in order. required for our date-walking algorithm
-	dateRanges.sort(compareUnzonedRanges);
+	ranges.sort(compareUnzonedRanges);
 
-	for (i = 0; i < dateRanges.length; i++) {
-		dateRange = dateRanges[i];
+	for (i = 0; i < ranges.length; i++) {
+		dateRange = ranges[i];
 
 		// add the span of time before the event (if there is any)
 		if (dateRange.startMs > startMs) { // compare millisecond time (skip any ambig logic)

src/models/event/EventInstanceGroup.js

@@ -32,18 +32,18 @@ var EventInstanceGroup = Class.extend({
 	sliceNormalRenderRanges: function(constraintRange) {
 		var eventInstances = this.eventInstances;
 		var i, eventInstance;
-		var slicedDateRange;
+		var slicedRange;
 		var slicedEventRanges = [];
 
 		for (i = 0; i < eventInstances.length; i++) {
 			eventInstance = eventInstances[i];
 
-			slicedDateRange = eventInstance.dateProfile.unzonedRange.constrainTo(constraintRange);
+			slicedRange = eventInstance.dateProfile.unzonedRange.constrainTo(constraintRange);
 
-			if (slicedDateRange) {
+			if (slicedRange) {
 				slicedEventRanges.push(
 					new EventRange(
-						slicedDateRange,
+						slicedRange,
 						eventInstance.def,
 						eventInstance
 					)
@@ -56,13 +56,13 @@ var EventInstanceGroup = Class.extend({
 
 
 	sliceInverseRenderRanges: function(constraintRange) {
-		var dateRanges = eventInstancesToDateRanges(this.eventInstances);
+		var unzonedRanges = eventInstancesToUnzonedRanges(this.eventInstances);
 		var ownerDef = this.getEventDef();
 
-		dateRanges = invertDateRanges(dateRanges, constraintRange);
+		unzonedRanges = invertUnzonedRanges(unzonedRanges, constraintRange);
 
-		return dateRanges.map(function(dateRange) {
-			return new EventRange(dateRange, ownerDef);
+		return unzonedRanges.map(function(unzonedRange) {
+			return new EventRange(unzonedRange, ownerDef); // don't give an EventDef
 		});
 	},
 

src/models/event/EventRange.js

@@ -1,13 +1,13 @@
 
 var EventRange = Class.extend({
 
-	dateRange: null,
+	unzonedRange: null,
 	eventDef: null,
 	eventInstance: null, // optional
 
 
-	constructor: function(dateRange, eventDef, eventInstance) {
-		this.dateRange = dateRange;
+	constructor: function(unzonedRange, eventDef, eventInstance) {
+		this.unzonedRange = unzonedRange;
 		this.eventDef = eventDef;
 
 		if (eventInstance) {

src/models/event/util.js

@@ -24,7 +24,7 @@ function eventInstancesToEventRanges(eventInstances) {
 }
 
 
-function eventInstancesToDateRanges(eventInstances) {
+function eventInstancesToUnzonedRanges(eventInstances) {
 	return eventInstances.map(function(eventInstance) {
 		return eventInstance.dateProfile.unzonedRange;
 	});