Ver Fonte

dont have computeDayRange return an UnzonedRange

Adam Shaw há 8 anos atrás
pai
commit
9f8e2a0004
2 ficheiros alterados com 7 adições e 7 exclusões
  1. 3 3
      src/common/ChronoComponent.js
  2. 4 4
      src/common/DayTableMixin.js

+ 3 - 3
src/common/ChronoComponent.js

@@ -554,7 +554,7 @@ var ChronoComponent = Model.extend({
 
 
 	// Returns the date range of the full days the given range visually appears to occupy.
-	// Returns a new range object.
+	// Returns a plain object with start/end, NOT an UnzonedRange!
 	computeDayRange: function(unzonedRange) {
 		var startDay = unzonedRange.getStart().stripTime(); // the beginning of the day the range starts
 		var end = unzonedRange.getEnd();
@@ -579,7 +579,7 @@ var ChronoComponent = Model.extend({
 			endDay = startDay.clone().add(1, 'days');
 		}
 
-		return new UnzonedRange(startDay, endDay);
+		return { start: startDay, end: endDay };
 	},
 
 
@@ -587,7 +587,7 @@ var ChronoComponent = Model.extend({
 	isMultiDayRange: function(unzonedRange) {
 		var dayRange = this.computeDayRange(unzonedRange);
 
-		return dayRange.getEnd().diff(dayRange.getStart(), 'days') > 1;
+		return dayRange.end.diff(dayRange.start, 'days') > 1;
 	},
 
 

+ 4 - 4
src/common/DayTableMixin.js

@@ -161,8 +161,8 @@ var DayTableMixin = FC.DayTableMixin = {
 	sliceRangeByRow: function(unzonedRange) {
 		var daysPerRow = this.daysPerRow;
 		var normalRange = this.view.computeDayRange(unzonedRange); // make whole-day range, considering nextDayThreshold
-		var rangeFirst = this.getDateDayIndex(normalRange.getStart()); // inclusive first index
-		var rangeLast = this.getDateDayIndex(normalRange.getEnd().subtract(1, 'days')); // inclusive last index
+		var rangeFirst = this.getDateDayIndex(normalRange.start); // inclusive first index
+		var rangeLast = this.getDateDayIndex(normalRange.end.clone().subtract(1, 'days')); // inclusive last index
 		var segs = [];
 		var row;
 		var rowFirst, rowLast; // inclusive day-index range for current row
@@ -204,8 +204,8 @@ var DayTableMixin = FC.DayTableMixin = {
 	sliceRangeByDay: function(unzonedRange) {
 		var daysPerRow = this.daysPerRow;
 		var normalRange = this.view.computeDayRange(unzonedRange); // make whole-day range, considering nextDayThreshold
-		var rangeFirst = this.getDateDayIndex(normalRange.getStart()); // inclusive first index
-		var rangeLast = this.getDateDayIndex(normalRange.getEnd().subtract(1, 'days')); // inclusive last index
+		var rangeFirst = this.getDateDayIndex(normalRange.start); // inclusive first index
+		var rangeLast = this.getDateDayIndex(normalRange.end.clone().subtract(1, 'days')); // inclusive last index
 		var segs = [];
 		var row;
 		var rowFirst, rowLast; // inclusive day-index range for current row