Adam Shaw 8 лет назад
Родитель
Сommit
05ecc6dd8a
4 измененных файлов с 6 добавлено и 6 удалено
  1. 1 1
      src/Calendar.constraints.js
  2. 2 2
      src/common/Grid.events.js
  3. 2 2
      src/common/Grid.js
  4. 1 1
      src/models/UnzonedRange.js

+ 1 - 1
src/Calendar.constraints.js

@@ -342,7 +342,7 @@ Calendar.prototype.parseFootprints = function(rawInput) {
 
 
 Calendar.prototype.footprintContainsFootprint = function(outerFootprint, innerFootprint) {
-	return outerFootprint.unzonedRange.contains(innerFootprint.unzonedRange);
+	return outerFootprint.unzonedRange.containsRange(innerFootprint.unzonedRange);
 };
 
 

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

@@ -1077,7 +1077,7 @@ Grid.mixin({
 		var i;
 
 		for (i = 0; i < eventFootprints.length; i++) {
-			if (!this.view.validUnzonedRange.contains(eventFootprints[i].componentFootprint.unzonedRange)) {
+			if (!this.view.validUnzonedRange.containsRange(eventFootprints[i].componentFootprint.unzonedRange)) {
 				return false;
 			}
 		}
@@ -1093,7 +1093,7 @@ Grid.mixin({
 		var i;
 
 		for (i = 0; i < eventFootprints.length; i++) {
-			if (!this.view.validUnzonedRange.contains(eventFootprints[i].componentFootprint.unzonedRange)) {
+			if (!this.view.validUnzonedRange.containsRange(eventFootprints[i].componentFootprint.unzonedRange)) {
 				return false;
 			}
 		}

+ 2 - 2
src/common/Grid.js

@@ -160,7 +160,7 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	getSafeHitFootprint: function(hit) {
 		var footprint = this.getHitFootprint(hit);
 
-		if (!this.view.activeUnzonedRange.contains(footprint.unzonedRange)) {
+		if (!this.view.activeUnzonedRange.containsRange(footprint.unzonedRange)) {
 			return null;
 		}
 
@@ -505,7 +505,7 @@ var Grid = FC.Grid = ChronoComponent.extend({
 
 
 	isSelectionFootprintAllowed: function(componentFootprint) {
-		return this.view.validUnzonedRange.contains(componentFootprint.unzonedRange) &&
+		return this.view.validUnzonedRange.containsRange(componentFootprint.unzonedRange) &&
 			this.view.calendar.isSelectionFootprintAllowed(componentFootprint);
 	},
 

+ 1 - 1
src/models/UnzonedRange.js

@@ -61,7 +61,7 @@ var UnzonedRange = FC.UnzonedRange = Class.extend({
 	},
 
 
-	contains: function(innerRange) {
+	containsRange: function(innerRange) {
 		return (this.startMs === null || (innerRange.startMs !== null && innerRange.startMs >= this.startMs)) &&
 			(this.endMs === null || (innerRange.endMs !== null && innerRange.endMs <= this.endMs));
 	},