Procházet zdrojové kódy

unnecessary range restriction

Adam Shaw před 8 roky
rodič
revize
dc2ccc9b1b
2 změnil soubory, kde provedl 9 přidání a 21 odebrání
  1. 0 12
      src/common/Grid.events.js
  2. 9 9
      src/common/Grid.js

+ 0 - 12
src/common/Grid.events.js

@@ -1015,12 +1015,6 @@ Grid.mixin({
 		var eventFootprints = this.eventRangesToEventFootprints(eventRanges);
 		var i;
 
-		for (i = 0; i < eventFootprints.length; i++) {
-			if (!this.isFootprintInRange(eventFootprints[i].componentFootprint)) {
-				return false;
-			}
-		}
-
 		for (i = 0; i < eventFootprints.length; i++) {
 			if (!calendar.isEventFootprintAllowed(eventFootprints[i])) {
 				return false;
@@ -1039,12 +1033,6 @@ Grid.mixin({
 		var eventFootprints = this.eventRangesToEventFootprints(eventRanges);
 		var i;
 
-		for (i = 0; i < eventFootprints.length; i++) {
-			if (!this.isFootprintInRange(eventFootprints[i].componentFootprint)) {
-				return false;
-			}
-		}
-
 		for (i = 0; i < eventFootprints.length; i++) {
 			// treat it as a selection
 			if (!calendar.isSelectionFootprintAllowed(eventFootprints[i].componentFootprint)) {

+ 9 - 9
src/common/Grid.js

@@ -129,6 +129,14 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	},
 
 
+	isFootprintInRange: function(componentFootprint) { // used by other things too
+		return isRangeWithinRange(
+			componentFootprint.dateRange.getRange(),
+			this.view.validRange
+		);
+	},
+
+
 	// Diffs the two dates, returning a duration, based on granularity of the grid
 	// TODO: port isTimeScale into this system?
 	diffDates: function(a, b) {
@@ -180,7 +188,7 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	getSafeHitFootprint: function(hit) {
 		var footprint = this.getHitFootprint(hit);
 
-		if (!isRangeWithinRange(footprint.dateRange.getRange(), this.view.activeRange)) {
+		if (!this.isFootprintInRange(footprint)) {
 			return null;
 		}
 
@@ -519,14 +527,6 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	},
 
 
-	isFootprintInRange: function(componentFootprint) { // used by other things too
-		return isRangeWithinRange(
-			componentFootprint.dateRange.getRange(),
-			this.view.validRange
-		);
-	},
-
-
 	/* Highlight
 	------------------------------------------------------------------------------------------------------------------*/