Adam Shaw 9 лет назад
Родитель
Сommit
640ab7dd37
3 измененных файлов с 13 добавлено и 13 удалено
  1. 6 6
      src/basic/BasicView.js
  2. 5 5
      src/basic/MonthView.js
  3. 2 2
      src/common/View.js

+ 6 - 6
src/basic/BasicView.js

@@ -42,20 +42,20 @@ var BasicView = FC.BasicView = View.extend({
 
 
 	// Computes the date range that will be rendered.
-	computeUnfilteredVisibleRange: function(currentRange) {
-		var visibleRange = View.prototype.computeUnfilteredVisibleRange.call(this, currentRange);
+	computeRenderRange: function(currentRange) {
+		var renderRange = View.prototype.computeRenderRange.call(this, currentRange);
 
 		// year and month views should be aligned with weeks. this is already done for week
 		if (/^(year|month)$/.test(this.intervalUnit)) {
-			visibleRange.start.startOf('week');
+			renderRange.start.startOf('week');
 
 			// make end-of-week if not already
-			if (visibleRange.end.weekday()) {
-				visibleRange.end.add(1, 'week').startOf('week'); // exclusively move backwards
+			if (renderRange.end.weekday()) {
+				renderRange.end.add(1, 'week').startOf('week'); // exclusively move backwards
 			}
 		}
 
-		return visibleRange;
+		return renderRange;
 	},
 
 

+ 5 - 5
src/basic/MonthView.js

@@ -6,19 +6,19 @@ var MonthView = FC.MonthView = BasicView.extend({
 
 
 	// Computes the date range that will be rendered.
-	computeUnfilteredVisibleRange: function(currentRange) {
-		var visibleRange = BasicView.prototype.computeUnfilteredVisibleRange.call(this, currentRange);
+	computeRenderRange: function(currentRange) {
+		var renderRange = BasicView.prototype.computeRenderRange.call(this, currentRange);
 		var rowCnt;
 
 		// ensure 6 weeks
 		if (this.isFixedWeeks()) {
 			rowCnt = Math.ceil( // could be partial weeks due to hiddenDays
-				visibleRange.end.diff(visibleRange.start, 'weeks', true) // dontRound=true
+				renderRange.end.diff(renderRange.start, 'weeks', true) // dontRound=true
 			);
-			visibleRange.end.add(6 - rowCnt, 'weeks');
+			renderRange.end.add(6 - rowCnt, 'weeks');
 		}
 
-		return visibleRange;
+		return renderRange;
 	},
 
 

+ 2 - 2
src/common/View.js

@@ -177,7 +177,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	resolveRangesForDate: function(date) {
 		var validRange = this.buildValidRange();
 		var currentRange = this.computeCurrentRange(date);
-		var renderRange = this.computeUnfilteredVisibleRange(currentRange);
+		var renderRange = this.computeRenderRange(currentRange);
 		var visibleRange = constrainRange(renderRange, validRange);
 
 		if (this.opt('disableNonCurrentDates')) {
@@ -232,7 +232,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 
 	// Computes the date range that will be rendered.
-	computeUnfilteredVisibleRange: function(currentRange) {
+	computeRenderRange: function(currentRange) {
 		return cloneRange(currentRange);
 	},