rename to UnzonedRange::intersect

src/common/Grid.events.js

@@ -1170,7 +1170,7 @@ Grid.mixin({
 		var i, seg;
 
 		if (constraintRange) {
-			unzonedRange = unzonedRange.constrainTo(constraintRange);
+			unzonedRange = unzonedRange.intersect(constraintRange);
 		}
 
 		segs = this.componentFootprintToSegs(eventFootprint.componentFootprint);

src/common/TimeGrid.js

@@ -289,7 +289,7 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 
 		for (dayIndex = 0; dayIndex < this.daysPerRow; dayIndex++) {
 
-			segRange = unzonedRange.constrainTo(this.dayRanges[dayIndex]);
+			segRange = unzonedRange.intersect(this.dayRanges[dayIndex]);
 
 			if (segRange) {
 				segs.push({

src/common/View.date-range.js

@@ -99,14 +99,14 @@ View.mixin({
 		activeUnzonedRange = renderUnzonedRange.clone();
 
 		if (!this.opt('showNonCurrentDates')) {
-			activeUnzonedRange = activeUnzonedRange.constrainTo(currentInfo.unzonedRange);
+			activeUnzonedRange = activeUnzonedRange.intersect(currentInfo.unzonedRange);
 		}
 
 		minTime = moment.duration(this.opt('minTime'));
 		maxTime = moment.duration(this.opt('maxTime'));
 		activeUnzonedRange = this.adjustActiveRange(activeUnzonedRange, minTime, maxTime);
 
-		activeUnzonedRange = activeUnzonedRange.constrainTo(validUnzonedRange);
+		activeUnzonedRange = activeUnzonedRange.intersect(validUnzonedRange);
 
 		if (activeUnzonedRange) {
 			date = this.calendar.msToUtcMoment(

src/list/ListView.js

@@ -92,7 +92,7 @@ var ListViewGrid = Grid.extend({
 		var segs = [];
 
 		for (dayIndex = 0; dayIndex < dayRanges.length; dayIndex++) {
-			segRange = footprint.unzonedRange.constrainTo(dayRanges[dayIndex]);
+			segRange = footprint.unzonedRange.intersect(dayRanges[dayIndex]);
 
 			if (segRange) {
 				seg = {

src/models/UnzonedRange.js

@@ -28,26 +28,26 @@ var UnzonedRange = FC.UnzonedRange = Class.extend({
 		}
 	},
 
-	constrainTo: function(constraintRange) { // TODO: rename to "intersect"
+	intersect: function(otherRange) {
 		var startMs = this.startMs;
 		var endMs = this.endMs;
 		var newRange = null;
 
-		if (constraintRange.startMs !== null) {
+		if (otherRange.startMs !== null) {
 			if (startMs === null) {
-				startMs = constraintRange.startMs;
+				startMs = otherRange.startMs;
 			}
 			else {
-				startMs = Math.max(startMs, constraintRange.startMs);
+				startMs = Math.max(startMs, otherRange.startMs);
 			}
 		}
 
-		if (constraintRange.endMs !== null) {
+		if (otherRange.endMs !== null) {
 			if (endMs === null) {
-				endMs = constraintRange.endMs;
+				endMs = otherRange.endMs;
 			}
 			else {
-				endMs = Math.min(endMs, constraintRange.endMs);
+				endMs = Math.min(endMs, otherRange.endMs);
 			}
 		}
 

src/models/event/EventInstanceGroup.js

@@ -38,7 +38,7 @@ var EventInstanceGroup = Class.extend({
 		for (i = 0; i < eventInstances.length; i++) {
 			eventInstance = eventInstances[i];
 
-			slicedRange = eventInstance.dateProfile.unzonedRange.constrainTo(constraintRange);
+			slicedRange = eventInstance.dateProfile.unzonedRange.intersect(constraintRange);
 
 			if (slicedRange) {
 				slicedEventRanges.push(