visibleRange -> activeRange

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.visibleRange.start,
-				view.visibleRange.end
+				view.activeRange.start,
+				view.activeRange.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 = isDateWithinRange(date, view.visibleRange); // TODO: called too frequently. cache somehow.
+		var isDateValid = isDateWithinRange(date, view.activeRange); // 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 = isDateWithinRange(date, view.visibleRange); // TODO: called too frequently. cache somehow.
+		var isDateValid = isDateWithinRange(date, view.activeRange); // 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 = isDateWithinRange(date, view.visibleRange); // TODO: called too frequently. cache somehow.
+		var isDateValid = isDateWithinRange(date, view.activeRange); // 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.visibleRange.end, // guaranteed out-of-range
-					end: this.view.visibleRange.end,   // "
+					start: this.view.activeRange.end, // guaranteed out-of-range
+					end: this.view.activeRange.end,   // "
 					dow: null
 				})
 			];
@@ -1162,7 +1162,7 @@ Grid.mixin({
 	refineRawEventRange: function(rawRange) {
 		var view = this.view;
 		var calendar = view.calendar;
-		var range = intersectRanges(rawRange, view.visibleRange);
+		var range = intersectRanges(rawRange, view.activeRange);
 
 		if (range) { // otherwise, event doesn't have valid range
 
@@ -1254,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.visibleRange.start.clone(); // need a copy
-		var viewEnd = view.visibleRange.end.clone(); // need a copy
+		var viewStart = view.activeRange.start.clone(); // need a copy
+		var viewEnd = view.activeRange.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 (!isRangeWithinRange(hitSpan, this.view.visibleRange)) {
+		if (!isRangeWithinRange(hitSpan, this.view.activeRange)) {
 			return null;
 		}
 
@@ -695,7 +695,7 @@ var Grid = FC.Grid = Class.extend(ListenerMixin, {
 		var classes = [];
 		var today;
 
-		if (!isDateWithinRange(date, view.visibleRange)) {
+		if (!isDateWithinRange(date, view.activeRange)) {
 			classes.push('fc-disabled-day'); // TODO: jQuery UI theme?
 		}
 		else {

src/common/View.js

@@ -36,13 +36,13 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	renderRange: null,
 
 	// active dates that display events and accept drag-nd-drop
-	visibleRange: null,
+	activeRange: null,
 
 	// date constraints. defines the "valid range"
 	// TODO: enforce this in prev/next/gotoDate
 	validRange: null,
 
-	start: null, // DEPRECATED: use visibleRange instead
+	start: null, // DEPRECATED: use activeRange instead
 	end: null,   // "
 	intervalStart: null, // DEPRECATED: use currentRange instead
 	intervalEnd: null,    // "
@@ -157,20 +157,20 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 		this.validRange = ranges.validRange;
 
-		if (!this.visibleRange || !isRangesEqual(this.visibleRange, ranges.visibleRange)) {
+		if (!this.activeRange || !isRangesEqual(this.activeRange, ranges.activeRange)) {
 			// some sort of change
 
 			this.currentRange = ranges.currentRange;
 			this.currentRangeUnit = ranges.currentRangeUnit;
 			this.renderRange = ranges.renderRange;
-			this.visibleRange = ranges.visibleRange;
+			this.activeRange = ranges.activeRange;
 			this.dateIncrement = ranges.dateIncrement;
 			this.currentDate = ranges.date;
 
 			// DEPRECATED, but we need to keep it updated
 			// TODO: run automated tests with this commented out
-			this.start = ranges.visibleRange.start;
-			this.end = ranges.visibleRange.end;
+			this.start = ranges.activeRange.start;
+			this.end = ranges.activeRange.end;
 			this.intervalStart = ranges.currentRange.start;
 			this.intervalEnd = ranges.currentRange.end;
 
@@ -189,26 +189,26 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 		var isDateValid = isDateWithinRange(date, validRange);
 		var currentInfo;
 		var renderRange;
-		var visibleRange;
+		var activeRange;
 		var isVisibleRangeValid;
 
 		date = constrainDate(date, validRange);
 		currentInfo = this.buildCurrentRangeInfo(date, direction);
 		renderRange = this.buildRenderRange(currentInfo.range, currentInfo.unit);
-		visibleRange = constrainRange(renderRange, validRange);
+		activeRange = constrainRange(renderRange, validRange);
 
 		if (this.opt('disableNonCurrentDates')) {
-			visibleRange = constrainRange(visibleRange, currentInfo.range);
+			activeRange = constrainRange(activeRange, currentInfo.range);
 		}
 
-		date = constrainDate(date, visibleRange);
-		isVisibleRangeValid = Boolean(intersectRanges(visibleRange, currentInfo.range));
+		date = constrainDate(date, activeRange);
+		isVisibleRangeValid = Boolean(intersectRanges(activeRange, currentInfo.range));
 
 		return {
 			validRange: validRange,
 			currentRange: currentInfo.range,
 			currentRangeUnit: currentInfo.unit,
-			visibleRange: visibleRange,
+			activeRange: activeRange,
 			renderRange: renderRange,
 			isValid: isDateValid && isVisibleRangeValid,
 			date: date,
@@ -418,7 +418,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.visibleRange;
+			range = this.activeRange;
 		}
 
 		return this.formatRange(
@@ -1228,7 +1228,10 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 
 	requestEvents: function() {
-		return this.calendar.requestEvents(this.visibleRange.start, this.visibleRange.end);
+		return this.calendar.requestEvents(
+			this.activeRange.start,
+			this.activeRange.end
+		);
 	},
 
 

tests/automated-better/view-dates/ViewDateUtils.js

@@ -7,10 +7,10 @@ var ViewDateUtils = {
 		expect(currentView.renderRange.end).toEqualMoment(end);
 	},
 
-	expectVisibleRange: function(start, end) {
+	expectActiveRange: function(start, end) {
 		var currentView = currentCalendar.getView();
-		expect(currentView.visibleRange.start).toEqualMoment(start);
-		expect(currentView.visibleRange.end).toEqualMoment(end);
+		expect(currentView.activeRange.start).toEqualMoment(start);
+		expect(currentView.activeRange.end).toEqualMoment(end);
 	}
 
 };

tests/automated-better/view-dates/dateAlignment.js

@@ -16,7 +16,7 @@ describe('dateAlignment', function() {
 
 		it('aligns with the week', function() {
 			initCalendar();
-			ViewDateUtils.expectVisibleRange('2017-06-11', '2017-06-14');
+			ViewDateUtils.expectActiveRange('2017-06-11', '2017-06-14');
 		});
 	});
 
@@ -28,7 +28,7 @@ describe('dateAlignment', function() {
 
 		it('aligns with first visible day of the week', function() {
 			initCalendar();
-			ViewDateUtils.expectVisibleRange('2017-06-12', '2017-06-17');
+			ViewDateUtils.expectActiveRange('2017-06-12', '2017-06-17');
 		});
 	});
 });

tests/automated-better/view-dates/dayCount.js

@@ -22,7 +22,7 @@ describe('dayCount', function() {
 	}, function() {
 		it('renders the exact day count', function() {
 			initCalendar();
-			ViewDateUtils.expectVisibleRange('2017-03-15', '2017-03-22');
+			ViewDateUtils.expectActiveRange('2017-03-15', '2017-03-22');
 			ViewRenderUtils.expectDay('2017-03-15', true);
 			ViewRenderUtils.expectDay('2017-03-16', true);
 			ViewRenderUtils.expectDay('2017-03-17', true);
@@ -38,7 +38,7 @@ describe('dayCount', function() {
 			defaultView: 'agenda',
 			dayCount: 9
 		});
-		ViewDateUtils.expectVisibleRange('2017-03-15', '2017-03-28');
+		ViewDateUtils.expectActiveRange('2017-03-15', '2017-03-28');
 		ViewRenderUtils.expectDay('2017-03-15', true);
 		ViewRenderUtils.expectDay('2017-03-16', true);
 		ViewRenderUtils.expectDay('2017-03-17', true);

tests/automated-better/view-dates/next.js

@@ -13,7 +13,7 @@ describe('next', function() {
 			it('moves forward by one week', function() {
 				initCalendar();
 				currentCalendar.next();
-				ViewDateUtils.expectVisibleRange('2017-06-11', '2017-06-18');
+				ViewDateUtils.expectActiveRange('2017-06-11', '2017-06-18');
 			});
 		})
 
@@ -25,7 +25,7 @@ describe('next', function() {
 			it('moves forward by two weeks', function() {
 				initCalendar();
 				currentCalendar.next();
-				ViewDateUtils.expectVisibleRange('2017-06-18', '2017-06-25');
+				ViewDateUtils.expectActiveRange('2017-06-18', '2017-06-25');
 			});
 		});
 	});
@@ -40,7 +40,7 @@ describe('next', function() {
 			it('moves forward by one month', function() {
 				initCalendar();
 				currentCalendar.next();
-				ViewDateUtils.expectVisibleRange('2017-06-25', '2017-08-06');
+				ViewDateUtils.expectActiveRange('2017-06-25', '2017-08-06');
 			});
 		});
 
@@ -52,7 +52,7 @@ describe('next', function() {
 			it('moves forward by two months', function() {
 				initCalendar();
 				currentCalendar.next();
-				ViewDateUtils.expectVisibleRange('2017-07-30', '2017-09-10');
+				ViewDateUtils.expectActiveRange('2017-07-30', '2017-09-10');
 			});
 		});
 	});
@@ -69,7 +69,7 @@ describe('next', function() {
 				it('moves forward three days', function() {
 					initCalendar();
 					currentCalendar.next();
-					ViewDateUtils.expectVisibleRange('2017-06-11', '2017-06-14');
+					ViewDateUtils.expectActiveRange('2017-06-11', '2017-06-14');
 				});
 			});
 
@@ -80,7 +80,7 @@ describe('next', function() {
 				it('moves forward two days', function() {
 					initCalendar();
 					currentCalendar.next();
-					ViewDateUtils.expectVisibleRange('2017-06-10', '2017-06-13');
+					ViewDateUtils.expectActiveRange('2017-06-10', '2017-06-13');
 				});
 			});
 		})
@@ -94,7 +94,7 @@ describe('next', function() {
 				it('moves forward one week', function() {
 					initCalendar();
 					currentCalendar.next();
-					ViewDateUtils.expectVisibleRange('2017-06-11', '2017-06-14');
+					ViewDateUtils.expectActiveRange('2017-06-11', '2017-06-14');
 				});
 			});
 
@@ -115,7 +115,7 @@ describe('next', function() {
 					called = false;
 					currentCalendar.next();
 
-					ViewDateUtils.expectVisibleRange('2017-06-04', '2017-06-07'); // the same as how it started
+					ViewDateUtils.expectActiveRange('2017-06-04', '2017-06-07'); // the same as how it started
 					expect(called).toBe(false);
 				});
 			});

tests/automated-better/view-dates/prev.js

@@ -15,7 +15,7 @@ describe('prev', function() {
 		it('moves back by one week', function() {
 			initCalendar();
 			currentCalendar.prev();
-			ViewDateUtils.expectVisibleRange('2017-05-28', '2017-06-04');
+			ViewDateUtils.expectActiveRange('2017-05-28', '2017-06-04');
 		});
 
 		describe('when two week dateIncrement', function() {
@@ -26,7 +26,7 @@ describe('prev', function() {
 			it('moves back by two weeks', function() {
 				initCalendar();
 				currentCalendar.prev();
-				ViewDateUtils.expectVisibleRange('2017-05-21', '2017-05-28');
+				ViewDateUtils.expectActiveRange('2017-05-21', '2017-05-28');
 			});
 		});
 	});

tests/automated-better/view-dates/validRange.js

@@ -14,10 +14,10 @@ describe('validRange', function() {
 				validRange: { start: '2017-06-06' }
 			});
 
-			it('allows full renderRange but restricts visibleRange', function() {
+			it('allows full renderRange but restricts activeRange', function() {
 				initCalendar();
 				ViewDateUtils.expectRenderRange('2017-06-04', '2017-06-11');
-				ViewDateUtils.expectVisibleRange('2017-06-06', '2017-06-11');
+				ViewDateUtils.expectActiveRange('2017-06-06', '2017-06-11');
 			});
 		});
 
@@ -26,10 +26,10 @@ describe('validRange', function() {
 				validRange: { end: '2017-06-05' }
 			});
 
-			it('allows full renderRange but restricts visibleRange', function() {
+			it('allows full renderRange but restricts activeRange', function() {
 				initCalendar();
 				ViewDateUtils.expectRenderRange('2017-06-04', '2017-06-11');
-				ViewDateUtils.expectVisibleRange('2017-06-04', '2017-06-05');
+				ViewDateUtils.expectActiveRange('2017-06-04', '2017-06-05');
 			});
 		});
 
@@ -41,7 +41,7 @@ describe('validRange', function() {
 			it('initializes at earliest partially visible week', function() {
 				initCalendar();
 				ViewDateUtils.expectRenderRange('2017-06-11', '2017-06-18');
-				ViewDateUtils.expectVisibleRange('2017-06-14', '2017-06-18');
+				ViewDateUtils.expectActiveRange('2017-06-14', '2017-06-18');
 			});
 		});
 
@@ -53,7 +53,7 @@ describe('validRange', function() {
 			it('initializes at latest partially visible week', function() {
 				initCalendar();
 				ViewDateUtils.expectRenderRange('2017-05-21', '2017-05-28');
-				ViewDateUtils.expectVisibleRange('2017-05-21', '2017-05-24');
+				ViewDateUtils.expectActiveRange('2017-05-21', '2017-05-24');
 			});
 		});
 
@@ -83,7 +83,7 @@ describe('validRange', function() {
 
 				expect(validRangeSpy).toHaveBeenCalled();
 				ViewDateUtils.expectRenderRange('2017-06-04', '2017-06-11');
-				ViewDateUtils.expectVisibleRange('2017-06-06', '2017-06-11');
+				ViewDateUtils.expectActiveRange('2017-06-06', '2017-06-11');
 			});
 
 			it('can return a range object with moments', function() {
@@ -95,7 +95,7 @@ describe('validRange', function() {
 
 				expect(validRangeSpy).toHaveBeenCalled();
 				ViewDateUtils.expectRenderRange('2017-06-04', '2017-06-11');
-				ViewDateUtils.expectVisibleRange('2017-06-06', '2017-06-11');
+				ViewDateUtils.expectActiveRange('2017-06-06', '2017-06-11');
 			});
 		});
 	});
@@ -113,7 +113,7 @@ describe('validRange', function() {
 			it('renders earliest three valid days', function() {
 				initCalendar();
 				ViewDateUtils.expectRenderRange('2017-06-14', '2017-06-17');
-				ViewDateUtils.expectVisibleRange('2017-06-14', '2017-06-17');
+				ViewDateUtils.expectActiveRange('2017-06-14', '2017-06-17');
 			});
 		});
 
@@ -124,7 +124,7 @@ describe('validRange', function() {
 			it('renders latest possible valid day and two invalid days', function() {
 				initCalendar();
 				ViewDateUtils.expectRenderRange('2017-05-30', '2017-06-02');
-				ViewDateUtils.expectVisibleRange('2017-05-30', '2017-05-31');
+				ViewDateUtils.expectActiveRange('2017-05-30', '2017-05-31');
 			});
 		});
 	});

tests/automated-better/view-dates/view-duration.js

@@ -11,7 +11,7 @@ describe('view duration', function() {
 		});
 		it('aligns with start of week', function() {
 			initCalendar();
-			ViewDateUtils.expectVisibleRange('2017-03-12', '2017-03-19');
+			ViewDateUtils.expectActiveRange('2017-03-12', '2017-03-19');
 		});
 	});
 
@@ -21,7 +21,7 @@ describe('view duration', function() {
 		});
 		it('aligns with start of week', function() {
 			initCalendar();
-			ViewDateUtils.expectVisibleRange('2017-03-15', '2017-03-22');
+			ViewDateUtils.expectActiveRange('2017-03-15', '2017-03-22');
 		});
 	});
 });

tests/automated-better/view-dates/visibleRange.js

@@ -34,7 +34,7 @@ describe('visibleRange', function() {
 			}, function() {
 				it('gets set to the given range', function() {
 					initCalendar();
-					ViewDateUtils.expectVisibleRange(startInput, endInput);
+					ViewDateUtils.expectActiveRange(startInput, endInput);
 				});
 			});
 
@@ -51,7 +51,7 @@ describe('visibleRange', function() {
 					},
 					defaultView: 'myCustomView'
 				});
-				ViewDateUtils.expectVisibleRange(startInput, endInput);
+				ViewDateUtils.expectActiveRange(startInput, endInput);
 			});
 
 			it('ignores dateAlignment', function() {
@@ -62,7 +62,7 @@ describe('visibleRange', function() {
 						end: endInput
 					}
 				});
-				ViewDateUtils.expectVisibleRange(startInput, endInput);
+				ViewDateUtils.expectActiveRange(startInput, endInput);
 			});
 		});
 
@@ -104,7 +104,7 @@ describe('visibleRange', function() {
 					initCalendar({
 						defaultDate: '2017-08-01'
 					})
-					ViewDateUtils.expectVisibleRange('2017-08-01', '2017-08-02');
+					ViewDateUtils.expectActiveRange('2017-08-01', '2017-08-02');
 				});
 			});
 		});
@@ -120,7 +120,7 @@ describe('visibleRange', function() {
 					}
 				});
 				currentCalendar.changeView('agendaDay');
-				ViewDateUtils.expectVisibleRange('2017-06-26', '2017-06-27');
+				ViewDateUtils.expectActiveRange('2017-06-26', '2017-06-27');
 			});
 
 			it('constrains the current date to the end of visibleRange', function() {
@@ -132,7 +132,7 @@ describe('visibleRange', function() {
 					}
 				});
 				currentCalendar.changeView('agendaDay');
-				ViewDateUtils.expectVisibleRange('2017-06-28', '2017-06-29');
+				ViewDateUtils.expectActiveRange('2017-06-28', '2017-06-29');
 			});
 		});
 	});
@@ -151,7 +151,7 @@ describe('visibleRange', function() {
 					end: '2017-07-04'
 				}
 			});
-			ViewDateUtils.expectVisibleRange('2015-06-08', '2015-06-11');
+			ViewDateUtils.expectActiveRange('2015-06-08', '2015-06-11');
 		});
 	});
 
@@ -168,7 +168,7 @@ describe('visibleRange', function() {
 					end: '2017-07-04'
 				}
 			});
-			ViewDateUtils.expectVisibleRange('2015-06-07', '2015-06-14');
+			ViewDateUtils.expectActiveRange('2015-06-07', '2015-06-14');
 		});
 	});
 });

tests/automated-better/view-type/changeView.js

@@ -8,21 +8,21 @@ describe('changeView', function() {
 	it('can change views', function() {
 		initCalendar();
 		currentCalendar.changeView('agendaWeek');
-		ViewDateUtils.expectVisibleRange('2017-06-04', '2017-06-11');
+		ViewDateUtils.expectActiveRange('2017-06-04', '2017-06-11');
 	});
 
 	it('can change views and navigate date', function() {
 		initCalendar();
 		currentCalendar.changeView('agendaDay', '2017-06-26');
-		ViewDateUtils.expectVisibleRange('2017-06-26', '2017-06-27');
+		ViewDateUtils.expectActiveRange('2017-06-26', '2017-06-27');
 	});
 
-	it('can change views and change visibleRange', function() {
+	it('can change views and change activeRange', function() {
 		initCalendar();
 		currentCalendar.changeView('agenda', {
 			start: '2017-07-04',
 			end: '2017-07-08'
 		});
-		ViewDateUtils.expectVisibleRange('2017-07-04', '2017-07-08');
+		ViewDateUtils.expectActiveRange('2017-07-04', '2017-07-08');
 	});
 });