Просмотр исходного кода

no more Grid::unzonedRange. use View::renderUnzonedRange

Adam Shaw 8 лет назад
Родитель
Сommit
18cf65a19e

+ 1 - 1
src/agenda/AgendaView.js

@@ -372,7 +372,7 @@ var agendaTimeGridMethods = {
 	// Generates the HTML that will go before the day-of week header cells
 	// Generates the HTML that will go before the day-of week header cells
 	renderHeadIntroHtml: function() {
 	renderHeadIntroHtml: function() {
 		var view = this.view;
 		var view = this.view;
-		var weekStart = view.calendar.msToUtcMoment(this.unzonedRange.startMs, true);
+		var weekStart = view.calendar.msToUtcMoment(view.renderUnzonedRange.startMs, true);
 		var weekText;
 		var weekText;
 
 
 		if (this.opt('weekNumbers')) {
 		if (this.opt('weekNumbers')) {

+ 2 - 2
src/common/DayTableMixin.js

@@ -18,8 +18,8 @@ var DayTableMixin = FC.DayTableMixin = {
 	updateDayTable: function() {
 	updateDayTable: function() {
 		var view = this.view;
 		var view = this.view;
 		var calendar = view.calendar;
 		var calendar = view.calendar;
-		var date = calendar.msToUtcMoment(this.unzonedRange.startMs, true);
-		var end = calendar.msToUtcMoment(this.unzonedRange.endMs, true);
+		var date = calendar.msToUtcMoment(view.renderUnzonedRange.startMs, true);
+		var end = calendar.msToUtcMoment(view.renderUnzonedRange.endMs, true);
 		var dayIndex = -1;
 		var dayIndex = -1;
 		var dayIndices = [];
 		var dayIndices = [];
 		var dayDates = [];
 		var dayDates = [];

+ 4 - 3
src/common/Grid.business-hours.js

@@ -28,19 +28,20 @@ Grid.mixin({
 
 
 
 
 	_buildBusinessHourEventFootprints: function(wholeDay, businessHourDef) {
 	_buildBusinessHourEventFootprints: function(wholeDay, businessHourDef) {
-		var calendar = this.view.calendar;
+		var view = this.view;
+		var calendar = view.calendar;
 		var eventInstanceGroup;
 		var eventInstanceGroup;
 		var eventRanges;
 		var eventRanges;
 
 
 		eventInstanceGroup = calendar.buildBusinessInstanceGroup(
 		eventInstanceGroup = calendar.buildBusinessInstanceGroup(
 			wholeDay,
 			wholeDay,
 			businessHourDef,
 			businessHourDef,
-			this.unzonedRange
+			view.renderUnzonedRange
 		);
 		);
 
 
 		if (eventInstanceGroup) {
 		if (eventInstanceGroup) {
 			eventRanges = eventInstanceGroup.sliceRenderRanges(
 			eventRanges = eventInstanceGroup.sliceRenderRanges(
-				this.unzonedRange,
+				view.renderUnzonedRange,
 				calendar
 				calendar
 			);
 			);
 		}
 		}

+ 1 - 1
src/common/Grid.event-dragging.js

@@ -104,7 +104,7 @@ Grid.mixin({
 					eventDefMutation &&
 					eventDefMutation &&
 					(dragHelperEls = view.renderDrag(
 					(dragHelperEls = view.renderDrag(
 						_this.eventRangesToEventFootprints(
 						_this.eventRangesToEventFootprints(
-							mutatedEventInstanceGroup.sliceRenderRanges(_this.unzonedRange, calendar)
+							mutatedEventInstanceGroup.sliceRenderRanges(view.renderUnzonedRange, calendar)
 						),
 						),
 						seg
 						seg
 					))
 					))

+ 1 - 1
src/common/Grid.event-resizing.js

@@ -86,7 +86,7 @@ Grid.mixin({
 
 
 					_this.renderEventResize(
 					_this.renderEventResize(
 						_this.eventRangesToEventFootprints(
 						_this.eventRangesToEventFootprints(
-							mutatedEventInstanceGroup.sliceRenderRanges(_this.unzonedRange, calendar)
+							mutatedEventInstanceGroup.sliceRenderRanges(view.renderUnzonedRange, calendar)
 						),
 						),
 						seg
 						seg
 					);
 					);

+ 1 - 1
src/common/Grid.external-dropping.js

@@ -72,7 +72,7 @@ Grid.mixin({
 				if (singleEventDef) {
 				if (singleEventDef) {
 					_this.renderDrag( // called without a seg parameter
 					_this.renderDrag( // called without a seg parameter
 						_this.eventRangesToEventFootprints(
 						_this.eventRangesToEventFootprints(
-							mutatedEventInstanceGroup.sliceRenderRanges(_this.unzonedRange, view.calendar)
+							mutatedEventInstanceGroup.sliceRenderRanges(view.renderUnzonedRange, view.calendar)
 						)
 						)
 					);
 					);
 				}
 				}

+ 0 - 4
src/common/Grid.js

@@ -18,8 +18,6 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	view: null, // a View object
 	view: null, // a View object
 	isRTL: null, // shortcut to the view's isRTL option
 	isRTL: null, // shortcut to the view's isRTL option
 
 
-	unzonedRange: null,
-
 	hitsNeededDepth: 0, // necessary because multiple callers might need the same hits
 	hitsNeededDepth: 0, // necessary because multiple callers might need the same hits
 
 
 	dayClickListener: null,
 	dayClickListener: null,
@@ -53,8 +51,6 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	// Tells the grid about what period of time to display.
 	// Tells the grid about what period of time to display.
 	// Any date-related internal data should be generated.
 	// Any date-related internal data should be generated.
 	setRange: function(unzonedRange) {
 	setRange: function(unzonedRange) {
-		this.unzonedRange = unzonedRange;
-
 		this.rangeUpdated();
 		this.rangeUpdated();
 		this.processRangeOptions();
 		this.processRangeOptions();
 	},
 	},

+ 2 - 2
src/common/TimeGrid.js

@@ -74,7 +74,7 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 		var theme = calendar.theme;
 		var theme = calendar.theme;
 		var isRTL = this.isRTL;
 		var isRTL = this.isRTL;
 		var html = '';
 		var html = '';
-		var slotTime = moment.duration(+this.view.minTime); // wish there was .clone() for durations
+		var slotTime = moment.duration(+view.minTime); // wish there was .clone() for durations
 		var slotIterator = moment.duration(0);
 		var slotIterator = moment.duration(0);
 		var slotDate; // will be on the view's first day, but we only care about its time
 		var slotDate; // will be on the view's first day, but we only care about its time
 		var isLabeled;
 		var isLabeled;
@@ -82,7 +82,7 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 
 
 		// Calculate the time for each slot
 		// Calculate the time for each slot
 		while (slotTime < view.maxTime) {
 		while (slotTime < view.maxTime) {
-			slotDate = calendar.msToUtcMoment(this.unzonedRange.startMs).time(slotTime);
+			slotDate = calendar.msToUtcMoment(view.renderUnzonedRange.startMs).time(slotTime);
 			isLabeled = isInt(divideDurationByDuration(slotIterator, this.labelInterval));
 			isLabeled = isInt(divideDurationByDuration(slotIterator, this.labelInterval));
 
 
 			axisHtml =
 			axisHtml =

+ 4 - 3
src/list/ListView.js

@@ -68,9 +68,10 @@ var ListViewGrid = Grid.extend({
 	hasDayInteractions: false, // no day selection or day clicking
 	hasDayInteractions: false, // no day selection or day clicking
 
 
 	rangeUpdated: function() {
 	rangeUpdated: function() {
-		var calendar = this.view.calendar;
-		var dayStart = calendar.msToUtcMoment(this.unzonedRange.startMs, true);
-		var viewEnd = calendar.msToUtcMoment(this.unzonedRange.endMs, true);
+		var view = this.view;
+		var calendar = view.calendar;
+		var dayStart = calendar.msToUtcMoment(view.renderUnzonedRange.startMs, true);
+		var viewEnd = calendar.msToUtcMoment(view.renderUnzonedRange.endMs, true);
 		var dayDates = [];
 		var dayDates = [];
 		var dayRanges = [];
 		var dayRanges = [];