Kaynağa Gözat

rename intervalRange -> currentRange

Adam Shaw 9 yıl önce
ebeveyn
işleme
71a71e9157
5 değiştirilmiş dosya ile 21 ekleme ve 21 silme
  1. 1 1
      src/Calendar.js
  2. 2 2
      src/basic/BasicView.js
  3. 2 2
      src/basic/MonthView.js
  4. 1 1
      src/common/Grid.js
  5. 15 15
      src/common/View.js

+ 1 - 1
src/Calendar.js

@@ -930,7 +930,7 @@ function Calendar_constructor(element, overrides) {
 	t.updateToolbarButtons = function() {
 		var now = t.getNow();
 
-		if (isDateWithinRange(now, currentView.intervalRange)) {
+		if (isDateWithinRange(now, currentView.currentRange)) {
 			toolbarsManager.proxyCall('disableButton', 'today');
 		}
 		else {

+ 2 - 2
src/basic/BasicView.js

@@ -42,8 +42,8 @@ var BasicView = FC.BasicView = View.extend({
 
 
 	// Computes the date range that will be rendered.
-	computeRenderRange: function(intervalRange) {
-		var renderRange = View.prototype.computeRenderRange.call(this, intervalRange);
+	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)) {

+ 2 - 2
src/basic/MonthView.js

@@ -6,8 +6,8 @@ var MonthView = FC.MonthView = BasicView.extend({
 
 
 	// Computes the date range that will be rendered.
-	computeRenderRange: function(intervalRange) {
-		var renderRange = BasicView.prototype.computeRenderRange.call(this, intervalRange);
+	computeRenderRange: function(currentRange) {
+		var renderRange = BasicView.prototype.computeRenderRange.call(this, currentRange);
 		var rowCnt;
 
 		// ensure 6 weeks

+ 1 - 1
src/common/Grid.js

@@ -703,7 +703,7 @@ var Grid = FC.Grid = Class.extend(ListenerMixin, {
 
 			if (
 				view.intervalDuration.as('months') == 1 &&
-				date.month() != view.intervalRange.start.month()
+				date.month() != view.currentRange.start.month()
 			) {
 				classes.push('fc-other-month');
 			}

+ 15 - 15
src/common/View.js

@@ -23,7 +23,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 	// range the view is formally responsible for (moments)
 	// may be different from start/end. for example, a month view might have 1st-31st, excluding padded dates
-	intervalRange: null, // TODO: rename to "currentRange"
+	currentRange: null,
 	intervalDuration: null,
 	intervalUnit: null, // name of largest unit being displayed, like "month" or "week"
 
@@ -40,7 +40,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 	start: null, // DEPRECATED: use contentRange instead
 	end: null,   // "
-	intervalStart: null, // DEPRECATED: use intervalRange instead
+	intervalStart: null, // DEPRECATED: use currentRange instead
 	intervalEnd: null,    // "
 
 	// for dates that are outside of validRange
@@ -163,14 +163,14 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 		}
 		this.validRange = validRange;
 
-		var intervalRange = this.computeIntervalRange(date);
-		var renderRange = this.computeRenderRange(intervalRange);
-		var contentRange = this.computeContentRange(renderRange, intervalRange);
+		var currentRange = this.computeCurrentRange(date);
+		var renderRange = this.computeRenderRange(currentRange);
+		var contentRange = this.computeContentRange(renderRange, currentRange);
 
 		if (!this.contentRange || !isRangesEqual(this.contentRange, contentRange)) {
 			// some sort of change
 
-			this.intervalRange = intervalRange;
+			this.currentRange = currentRange;
 			this.renderRange = renderRange;
 			this.contentRange = contentRange;
 
@@ -178,8 +178,8 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 			// TODO: run automated tests with this commented out
 			this.start = contentRange.start;
 			this.end = contentRange.end;
-			this.intervalStart = intervalRange.start;
-			this.intervalEnd = intervalRange.end;
+			this.intervalStart = currentRange.start;
+			this.intervalEnd = currentRange.end;
 
 			this.updateTitle();
 			this.calendar.updateToolbarButtons();
@@ -191,7 +191,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	},
 
 
-	computeIntervalRange: function(date) {
+	computeCurrentRange: function(date) {
 		var intervalStart = date.clone().startOf(this.intervalUnit);
 		var intervalEnd = intervalStart.clone().add(this.intervalDuration);
 
@@ -214,9 +214,9 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 
 	// Computes the date range that will be rendered.
-	computeRenderRange: function(intervalRange) {
+	computeRenderRange: function(currentRange) {
 		return this.sanitizeRenderRange(
-			cloneRange(intervalRange)
+			cloneRange(currentRange)
 		);
 	},
 
@@ -234,11 +234,11 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 	// Computes the date range that will be fully visible (not greyed out),
 	// and that will contain events and allow drag-n-drop.
-	computeContentRange: function(renderRange, intervalRange) {
+	computeContentRange: function(renderRange, currentRange) {
 		var contentRange = cloneRange(renderRange);
 
 		if (this.opt('disableNonCurrentDates')) {
-			contentRange = intersectRanges(contentRange, intervalRange);
+			contentRange = intersectRanges(contentRange, currentRange);
 		}
 
 		// probably already done in sanitizeRenderRange,
@@ -320,7 +320,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 		// for views that span a large unit of time, show the proper interval, ignoring stray days before and after
 		if (/^(year|month)$/.test(this.intervalUnit)) {
-			range = this.intervalRange;
+			range = this.currentRange;
 		}
 		else { // for day units or smaller, use the actual day range
 			range = this.contentRange;
@@ -328,7 +328,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 		return this.formatRange(
 			{
-				// in case intervalRange has a time, make sure timezone is correct
+				// in case currentRange has a time, make sure timezone is correct
 				start: this.calendar.applyTimezone(range.start),
 				end: this.calendar.applyTimezone(range.end)
 			},