Selaa lähdekoodia

Remove weekNumbersVisible variable

As suggested by arshaw, storing a member variable for the general
`weekNumbersVisible` is no longer necessary after breaking it into
two states (`colWeekNumbersVisible` and `cellWeekNumbersVisible`).
Peter Nowee 9 vuotta sitten
vanhempi
sitoutus
44d3281fe1
1 muutettua tiedostoa jossa 5 lisäystä ja 5 poistoa
  1. 5 5
      src/basic/BasicView.js

+ 5 - 5
src/basic/BasicView.js

@@ -12,7 +12,6 @@ var BasicView = FC.BasicView = View.extend({
 	dayGrid: null, // the main subcomponent that does most of the heavy lifting
 
 	dayNumbersVisible: false, // display day numbers on each day cell?
-	weekNumbersVisible: false, // display week numbers?
 	colWeekNumbersVisible: false, // display week numbers along the side?
 	cellWeekNumbersVisible: false, // display week numbers in day cell?
 
@@ -75,17 +74,18 @@ var BasicView = FC.BasicView = View.extend({
 	renderDates: function() {
 
 		this.dayNumbersVisible = this.dayGrid.rowCnt > 1; // TODO: make grid responsible
-		this.weekNumbersVisible = this.opt('weekNumbers');
-		this.dayGrid.numbersVisible = this.dayNumbersVisible || this.weekNumbersVisible;
-		if (this.weekNumbersVisible) {
+		if (this.opt('weekNumbers')) {
 			if (this.opt('basicViewWeekNrPosition') === 'weekNrDayCell') {
 				this.cellWeekNumbersVisible = true;
 				this.colWeekNumbersVisible = false;
-			} else {
+			}
+			else {
 				this.cellWeekNumbersVisible = false;
 				this.colWeekNumbersVisible = true;
 			};
 		}
+		this.dayGrid.numbersVisible = this.dayNumbersVisible ||
+			this.cellWeekNumbersVisible || this.colWeekNumbersVisible;
 
 		this.el.addClass('fc-basic-view').html(this.renderSkeletonHtml());
 		this.renderHead();