Adam Shaw vor 9 Jahren
Ursprung
Commit
5882d38579
4 geänderte Dateien mit 13 neuen und 20 gelöschten Zeilen
  1. 1 1
      src/common/DayGrid.js
  2. 4 4
      src/common/Grid.events.js
  3. 1 1
      src/common/Grid.js
  4. 7 14
      src/common/View.js

+ 1 - 1
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 isDayNumberVisible = view.dayNumbersVisible && view.isDateWithinContentRange(date);
+		var isDayNumberVisible = view.dayNumbersVisible && view.isDateInContentRange(date);
 		var classes;
 		var weekCalcFirstDoW;
 

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

@@ -419,7 +419,7 @@ Grid.mixin({
 				var origHitSpan;
 				var dragHelperEls;
 
-				if (view.isRangeWithinContentRange(hitSpan)) {
+				if (view.isRangeInContentRange(hitSpan)) {
 
 					// starting hit could be forced (DayGrid.limit)
 					if (seg.hit) {
@@ -632,7 +632,7 @@ Grid.mixin({
 				var isAllowed = true;
 				var hitSpan = hit.component.getHitSpan(hit); // hit might not belong to this grid
 
-				if (view.isRangeWithinContentRange(hitSpan)) {
+				if (view.isRangeInContentRange(hitSpan)) {
 					dropLocation = _this.computeExternalDrop(hitSpan, meta);
 					isAllowed = dropLocation && this.isExternalLocationAllowed(dropLocation, meta.eventProps);
 				}
@@ -747,7 +747,7 @@ Grid.mixin({
 				var hitSpan = _this.getHitSpan(hit);
 				var origHitSpan;
 
-				if (view.isRangeWithinContentRange(hitSpan)) {
+				if (view.isRangeInContentRange(hitSpan)) {
 					origHitSpan = _this.getHitSpan(origHit);
 
 					resizeLocation = isStart ?
@@ -1070,7 +1070,7 @@ Grid.mixin({
 
 
 	isEventLocationInRange: function(eventLocation) {
-		return this.view.isRangeWithinMinMaxDate(
+		return this.view.isRangeInValidRange(
 			this.eventToRawRange(eventLocation)
 		);
 	},

+ 1 - 1
src/common/Grid.js

@@ -673,7 +673,7 @@ var Grid = FC.Grid = Class.extend(ListenerMixin, {
 		var classes = [];
 		var today;
 
-		if (!view.isDateWithinContentRange(date)) {
+		if (!view.isDateInContentRange(date)) {
 			classes.push('fc-disabled-day'); // TODO: jQuery UI theme?
 		}
 		else {

+ 7 - 14
src/common/View.js

@@ -41,8 +41,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	start: null,
 	end: null,
 
-	// date constraints
-	// TODO: render populate and use in rendering
+	// date constraints. defines the "valid range"
 	// TODO: enforce this in prev/next/gotoDate
 	minDate: null,
 	maxDate: null,
@@ -207,7 +206,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 		renderRange = this.trimHiddenDays(renderRange);
 
 		if (this.isOutOfRangeHidden) {
-			renderRange = this.transformWithMinMaxDate(renderRange);
+			renderRange = this.trimToValidRange(renderRange);
 		}
 
 		return renderRange;
@@ -225,13 +224,13 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 		// probably already done in sanitizeRenderRange,
 		// but do again in case subclass added special behavior to computeRenderRange
-		contentRange = this.transformWithMinMaxDate(contentRange);
+		contentRange = this.trimToValidRange(contentRange);
 
 		return contentRange;
 	},
 
 
-	transformWithMinMaxDate: function(inputRange) {
+	trimToValidRange: function(inputRange) {
 		var range = cloneRange(inputRange);
 
 		if (this.minDate) {
@@ -245,24 +244,18 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	},
 
 
-	isDateWithinMinMaxDate: function(date) {
-		return (!this.minDate || date >= this.minDate) &&
-			(!this.maxDate || date < this.maxDate);
-	},
-
-
-	isRangeWithinMinMaxDate: function(range) {
+	isRangeInValidRange: function(range) {
 		return (!this.minDate || range.start >= this.minDate) &&
 			(!this.maxDate || range.end <= this.maxDate);
 	},
 
 
-	isDateWithinContentRange: function(date) {
+	isDateInContentRange: function(date) {
 		return date >= this.contentStart && date < this.contentEnd;
 	},
 
 
-	isRangeWithinContentRange: function(range) {
+	isRangeInContentRange: function(range) {
 		return range.start >= this.contentStart && range.end <= this.contentEnd;
 	},