Forráskód Böngészése

valid range -> content range

Adam Shaw 9 éve
szülő
commit
20f2b8bb0d
3 módosított fájl, 20 hozzáadás és 20 törlés
  1. 2 2
      src/EventManager.js
  2. 6 6
      src/common/Grid.events.js
  3. 12 12
      src/common/View.js

+ 2 - 2
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.validStart,
-				view.validEnd
+				view.contentStart,
+				view.contentEnd
 			)
 		);
 	}

+ 6 - 6
src/common/Grid.events.js

@@ -208,8 +208,8 @@ Grid.mixin({
 		if (!events.length && businessHours) {
 			events = [
 				$.extend({}, BUSINESS_HOUR_EVENT_DEFAULTS, {
-					start: this.view.validEnd, // guaranteed out-of-range
-					end: this.view.validEnd,   // "
+					start: this.view.contentEnd, // guaranteed out-of-range
+					end: this.view.contentEnd,   // "
 					dow: null
 				})
 			];
@@ -1148,8 +1148,8 @@ Grid.mixin({
 		var view = this.view;
 		var calendar = view.calendar;
 		var range = intersectRanges(rawRange, {
-			start: view.validStart,
-			end: view.validEnd
+			start: view.contentStart,
+			end: view.contentEnd
 		});
 
 		if (range) { // otherwise, event doesn't have valid range
@@ -1242,8 +1242,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.validStart.clone(); // need a copy
-		var viewEnd = view.validEnd.clone(); // need a copy
+		var viewStart = view.contentStart.clone(); // need a copy
+		var viewEnd = view.contentEnd.clone(); // need a copy
 		var inverseRanges = [];
 		var start = viewStart; // the end of the previous range. the start of the new range
 		var i, range;

+ 12 - 12
src/common/View.js

@@ -34,10 +34,10 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	renderEnd: null,
 
 	// active dates that display events and accept drag-nd-drop
-	validStart: null,
-	validEnd: null,
+	contentStart: null,
+	contentEnd: null,
 
-	// DEPRECATED: use validStart/validEnd instead
+	// DEPRECATED: use contentStart/contentEnd instead
 	start: null,
 	end: null,
 
@@ -161,13 +161,13 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 		this.intervalEnd = intervalRange.end;
 		this.renderStart = renderRange.start;
 		this.renderEnd = renderRange.end;
-		this.validStart = validRange.start;
-		this.validEnd = validRange.end;
+		this.contentStart = validRange.start;
+		this.contentEnd = validRange.end;
 
 		// DEPRECATED, but we need to keep it updated
 		// TODO: run automated tests with this commented out
-		this.start = this.validStart;
-		this.end = this.validEnd;
+		this.start = this.contentStart;
+		this.end = this.contentEnd;
 
 		this.updateTitle();
 	},
@@ -305,8 +305,8 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 			end = this.intervalEnd;
 		}
 		else { // for day units or smaller, use the actual day range
-			start = this.validStart;
-			end = this.validEnd;
+			start = this.contentStart;
+			end = this.contentEnd;
 		}
 
 		return this.formatRange(
@@ -1108,7 +1108,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 
 	requestEvents: function() {
-		return this.calendar.requestEvents(this.validStart, this.validEnd);
+		return this.calendar.requestEvents(this.contentStart, this.contentEnd);
 	},
 
 
@@ -1521,12 +1521,12 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 	// Computes if a renderable date should be displayed as disabled because it's out of range
 	isDisabledDate: function(date) { // TODO: rename
-		return date < this.validStart || date >= this.validEnd;
+		return date < this.contentStart || date >= this.contentEnd;
 	},
 
 
 	isValidRange: function(range) {
-		return range.start >= this.validStart && range.end <= this.validEnd; // TODO: date util. also, what about timezone?
+		return range.start >= this.contentStart && range.end <= this.contentEnd; // TODO: date util. also, what about timezone?
 	},