renames

src/common/DayGrid.js

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

src/common/Grid.events.js

@@ -1001,14 +1001,16 @@ Grid.mixin({
 
 
 	isEventLocationInRange: function(eventLocation) {
+		return false;
+
 		return isRangeWithinRange(
-			this.eventToRawRange(eventLocation),
+			//this.eventToRawRange(eventLocation),
 			this.view.validRange
 		);
 	},
 
 
-	/* Converting events -> eventRange -> eventSpan -> eventSegs
+	/* Converting events -> eventRange -> eventFootprint -> eventSegs
 	------------------------------------------------------------------------------------------------------------------*/
 
 
@@ -1036,14 +1038,14 @@ Grid.mixin({
 	// Given an event's range (unzoned start/end), and the event itself,
 	// slice into segments (using the segSliceFunc function if specified)
 	// eventRange - { start, end, isStart, isEnd }
-	eventRangeToSegs: function(eventRange, segSliceFunc) {
-		var eventSpans = this.eventRangeToSpans(eventRange);
+	eventRangeToSegs: function(eventRange) {
+		var eventFootprints = this.eventRangeToEventFootprints(eventRange);
 		var segs = [];
 		var i;
 
-		for (i = 0; i < eventSpans.length; i++) {
+		for (i = 0; i < eventFootprints.length; i++) {
 			segs.push.apply(segs, // append to
-				this.eventSpanToSegs(eventSpans[i], segSliceFunc)
+				this.eventFootprintToSegs(eventFootprints[i])
 			);
 		}
 
@@ -1055,11 +1057,11 @@ Grid.mixin({
 	// eventSpan - { start, end, isStart, isEnd, otherthings... }
 	// Subclasses can override.
 	// Subclasses are obligated to forward eventRange.isStart/isEnd to the resulting spans.
-	eventRangeToSpans: function(eventRange) {
+	eventRangeToEventFootprints: function(eventRange) {
 		return [
-			new EventSpan(
+			new EventFootprint(
 				eventRange.eventInstance,
-				new Span(eventRange.dateRange)
+				new ComponentFootprint(eventRange.dateRange)
 			)
 		];
 	},
@@ -1068,24 +1070,24 @@ Grid.mixin({
 	// Given an event's span (unzoned start/end and other misc data), and the event itself,
 	// slices into segments and attaches event-derived properties to them.
 	// eventSpan - { start, end, isStart, isEnd, otherthings... }
-	eventSpanToSegs: function(eventSpan) {
-		var segs = this.spanToSegs(eventSpan.span);
+	eventFootprintToSegs: function(eventFootprint) {
+		var segs = this.componentFootprintToSegs(eventFootprint.componentFootprint);
 		var i, seg;
 
 		for (i = 0; i < segs.length; i++) {
 			seg = segs[i];
 
-			// the eventSpan's isStart/isEnd takes precedence over the seg's
-			if (!eventSpan.span.dateRange.isStart) {
+			// the eventFootprint's isStart/isEnd takes precedence over the seg's
+			if (!eventFootprint.componentFootprint.dateRange.isStart) {
 				seg.isStart = false;
 			}
-			if (!eventSpan.span.dateRange.isEnd) {
+			if (!eventFootprint.componentFootprint.dateRange.isEnd) {
 				seg.isEnd = false;
 			}
 
-			seg.event = eventSpan.eventInstance.toLegacy();
-			seg.eventStartMS = +eventSpan.span.dateRange.startMs; // TODO: not the best name after making spans unzoned
-			seg.eventDurationMS = eventSpan.span.dateRange.endMs - eventSpan.span.dateRange.startMs;
+			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;
 		}
 
 		return segs;

src/common/TimeGrid.js

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

src/models/Span.js → src/models/ComponentFootprint.js

@@ -1,5 +1,5 @@
 
-var Span = Class.extend({ // TODO: ComponentFootprint
+var ComponentFootprint = Class.extend({
 
 	dateRange: null,
 

src/models/EventFootprint.js

@@ -0,0 +1,12 @@
+
+var EventFootprint = Class.extend({
+
+	eventInstance: null,
+	componentFootprint: null,
+
+	constructor: function(eventInstance, componentFootprint) {
+		this.eventInstance = eventInstance;
+		this.componentFootprint = componentFootprint;
+	}
+
+});

src/models/EventInstanceGroup.js

@@ -10,6 +10,7 @@ var EventInstanceGroup = Class.extend({
 	isInverse: function() {
 		var eventInstances = this.eventInstances;
 
+		// TODO: ask the source/calendar
 		return eventInstances.length && eventInstances[0].eventDefinition.rendering === 'inverse-background';
 	},
 

src/models/EventSpan.js

@@ -1,12 +0,0 @@
-
-var EventSpan = Class.extend({ // TODO: EventFootprint
-
-	eventInstance: null,
-	span: null, // TODO: componentFootprint
-
-	constructor: function(eventInstance, span) {
-		this.eventInstance = eventInstance;
-		this.span = span;
-	}
-
-});