rename contentRange -> visibleRange, remove some utils

src/EventManager.js

@@ -1401,8 +1401,8 @@ Calendar.prototype.expandBusinessHourEvents = function(wholeDay, inputs, ignoreN
 		events.push.apply(events, // append
 			this.expandEvent(
 				this.buildEventFromInput(input),
-				view.contentRange.start,
-				view.contentRange.end
+				view.visibleRange.start,
+				view.visibleRange.end
 			)
 		);
 	}

src/common/DayGrid.js

@@ -141,7 +141,7 @@ var DayGrid = FC.DayGrid = Grid.extend(DayTableMixin, {
 	renderNumberCellHtml: function(date) {
 		var view = this.view;
 		var html = '';
-		var isDateValid = view.isDateInContentRange(date); // TODO: called too frequently. cache somehow.
+		var isDateValid = isDateWithinRange(date, view.visibleRange); // TODO: called too frequently. cache somehow.
 		var isDayNumberVisible = view.dayNumbersVisible && isDateValid;
 		var classes;
 		var weekCalcFirstDoW;

src/common/DayTableMixin.js

@@ -294,7 +294,7 @@ var DayTableMixin = FC.DayTableMixin = {
 	// (colspan should be no different)
 	renderHeadDateCellHtml: function(date, colspan, otherAttrs) {
 		var view = this.view;
-		var isDateValid = view.isDateInContentRange(date); // TODO: called too frequently. cache somehow.
+		var isDateValid = isDateWithinRange(date, view.visibleRange); // TODO: called too frequently. cache somehow.
 		var classNames = [
 			'fc-day-header',
 			view.widgetHeaderClass
@@ -372,7 +372,7 @@ var DayTableMixin = FC.DayTableMixin = {
 
 	renderBgCellHtml: function(date, otherAttrs) {
 		var view = this.view;
-		var isDateValid = view.isDateInContentRange(date); // TODO: called too frequently. cache somehow.
+		var isDateValid = isDateWithinRange(date, view.visibleRange); // TODO: called too frequently. cache somehow.
 		var classes = this.getDayClasses(date);
 
 		if (isDateValid) {

src/common/Grid.events.js

@@ -218,8 +218,8 @@ Grid.mixin({
 		if (!events.length && businessHours) {
 			events = [
 				$.extend({}, BUSINESS_HOUR_EVENT_DEFAULTS, {
-					start: this.view.contentRange.end, // guaranteed out-of-range
-					end: this.view.contentRange.end,   // "
+					start: this.view.visibleRange.end, // guaranteed out-of-range
+					end: this.view.visibleRange.end,   // "
 					dow: null
 				})
 			];
@@ -1068,8 +1068,9 @@ Grid.mixin({
 
 
 	isEventLocationInRange: function(eventLocation) {
-		return this.view.isRangeInValidRange(
-			this.eventToRawRange(eventLocation)
+		return isRangeWithinRange(
+			this.eventToRawRange(eventLocation),
+			this.view.validRange
 		);
 	},
 
@@ -1161,7 +1162,7 @@ Grid.mixin({
 	refineRawEventRange: function(rawRange) {
 		var view = this.view;
 		var calendar = view.calendar;
-		var range = intersectRanges(rawRange, view.contentRange);
+		var range = intersectRanges(rawRange, view.visibleRange);
 
 		if (range) { // otherwise, event doesn't have valid range
 
@@ -1253,8 +1254,8 @@ Grid.mixin({
 	// SIDE EFFECT: will mutate the given array and will use its date references.
 	invertRanges: function(ranges) {
 		var view = this.view;
-		var viewStart = view.contentRange.start.clone(); // need a copy
-		var viewEnd = view.contentRange.end.clone(); // need a copy
+		var viewStart = view.visibleRange.start.clone(); // need a copy
+		var viewEnd = view.visibleRange.end.clone(); // need a copy
 		var inverseRanges = [];
 		var start = viewStart; // the end of the previous range. the start of the new range
 		var i, range;

src/common/Grid.js

@@ -173,7 +173,7 @@ var Grid = FC.Grid = Class.extend(ListenerMixin, {
 	getSafeHitSpan: function(hit) {
 		var hitSpan = this.getHitSpan(hit);
 
-		if (!this.view.isRangeInContentRange(hitSpan)) {
+		if (!isRangeWithinRange(hitSpan, this.view.visibleRange)) {
 			return null;
 		}
 
@@ -695,7 +695,7 @@ var Grid = FC.Grid = Class.extend(ListenerMixin, {
 		var classes = [];
 		var today;
 
-		if (!view.isDateInContentRange(date)) {
+		if (!isDateWithinRange(date, view.visibleRange)) {
 			classes.push('fc-disabled-day'); // TODO: jQuery UI theme?
 		}
 		else {

src/common/View.js

@@ -32,13 +32,13 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	renderRange: null,
 
 	// active dates that display events and accept drag-nd-drop
-	contentRange: null, // TODO: rename to "visibleRange"
+	visibleRange: null,
 
 	// date constraints. defines the "valid range"
 	// TODO: enforce this in prev/next/gotoDate
 	validRange: null,
 
-	start: null, // DEPRECATED: use contentRange instead
+	start: null, // DEPRECATED: use visibleRange instead
 	end: null,   // "
 	intervalStart: null, // DEPRECATED: use currentRange instead
 	intervalEnd: null,    // "
@@ -165,19 +165,19 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 		var currentRange = this.computeCurrentRange(date);
 		var renderRange = this.computeRenderRange(currentRange);
-		var contentRange = this.computeContentRange(renderRange, currentRange);
+		var visibleRange = this.computeVisibleRange(renderRange, currentRange);
 
-		if (!this.contentRange || !isRangesEqual(this.contentRange, contentRange)) {
+		if (!this.visibleRange || !isRangesEqual(this.visibleRange, visibleRange)) {
 			// some sort of change
 
 			this.currentRange = currentRange;
 			this.renderRange = renderRange;
-			this.contentRange = contentRange;
+			this.visibleRange = visibleRange;
 
 			// DEPRECATED, but we need to keep it updated
 			// TODO: run automated tests with this commented out
-			this.start = contentRange.start;
-			this.end = contentRange.end;
+			this.start = visibleRange.start;
+			this.end = visibleRange.end;
 			this.intervalStart = currentRange.start;
 			this.intervalEnd = currentRange.end;
 
@@ -234,33 +234,18 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 	// Computes the date range that will be fully visible (not greyed out),
 	// and that will contain events and allow drag-n-drop.
-	computeContentRange: function(renderRange, currentRange) {
-		var contentRange = cloneRange(renderRange);
+	computeVisibleRange: function(renderRange, currentRange) {
+		var visibleRange = cloneRange(renderRange);
 
 		if (this.opt('disableNonCurrentDates')) {
-			contentRange = intersectRanges(contentRange, currentRange);
+			visibleRange = intersectRanges(visibleRange, currentRange);
 		}
 
 		// probably already done in sanitizeRenderRange,
 		// but do again in case subclass added special behavior to computeRenderRange
-		contentRange = constrainRange(contentRange, this.validRange);
+		visibleRange = constrainRange(visibleRange, this.validRange);
 
-		return contentRange;
-	},
-
-
-	isRangeInValidRange: function(range) {
-		return isRangeWithinRange(range, this.validRange);
-	},
-
-
-	isDateInContentRange: function(date) {
-		return isDateWithinRange(date, this.contentRange);
-	},
-
-
-	isRangeInContentRange: function(range) {
-		return isRangeWithinRange(range, this.contentRange);
+		return visibleRange;
 	},
 
 
@@ -323,7 +308,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 			range = this.currentRange;
 		}
 		else { // for day units or smaller, use the actual day range
-			range = this.contentRange;
+			range = this.visibleRange;
 		}
 
 		return this.formatRange(
@@ -1133,7 +1118,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 
 	requestEvents: function() {
-		return this.calendar.requestEvents(this.contentRange.start, this.contentRange.end);
+		return this.calendar.requestEvents(this.visibleRange.start, this.visibleRange.end);
 	},