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

clean up some getStart/getEnd stuff

Adam Shaw 8 лет назад
Родитель
Сommit
8fdf91b751
3 измененных файлов с 11 добавлено и 6 удалено
  1. 4 3
      src/common/ChronoComponent.js
  2. 1 1
      src/common/DayTableMixin.js
  3. 6 2
      src/models/UnzonedRange.js

+ 4 - 3
src/common/ChronoComponent.js

@@ -514,7 +514,7 @@ var ChronoComponent = Model.extend({
 
 	// Computes HTML classNames for a single-day element
 	getDayClasses: function(date, noThemeHighlight) {
-		var view = this.view;
+		var view = this.view; // TODO: move away from using!
 		var classes = [];
 		var today;
 
@@ -556,8 +556,9 @@ var ChronoComponent = Model.extend({
 	// Returns the date range of the full days the given range visually appears to occupy.
 	// 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();
+		var calendar = this.view.calendar; // TODO: move away from using!
+		var startDay = calendar.msToUtcMoment(unzonedRange.startMs, true); // the beginning of the day the range starts
+		var end = calendar.msToUtcMoment(unzonedRange.endMs, true);
 		var endDay = null;
 		var endTimeMS;
 

+ 1 - 1
src/common/DayTableMixin.js

@@ -117,7 +117,7 @@ var DayTableMixin = FC.DayTableMixin = {
 	// Only works for *start* dates of cells. Will not work for exclusive end dates for cells.
 	getDateDayIndex: function(date) {
 		var dayIndices = this.dayIndices;
-		var dayOffset = date.diff(this.unzonedRange.getStart(), 'days');
+		var dayOffset = date.diff(this.dayDates[0], 'days');
 
 		if (dayOffset < 0) {
 			return dayIndices[0] - 1;

+ 6 - 2
src/models/UnzonedRange.js

@@ -108,14 +108,18 @@ var UnzonedRange = FC.UnzonedRange = Class.extend({
 	},
 
 
-	// hopefully we'll remove these...
-
+	// Returns an ambig-zoned moment from startMs.
+	// BEWARE: returned moment is not localized.
+	// Formatting and start-of-week will be default.
 	getStart: function() {
 		if (this.startMs !== null) {
 			return FC.moment.utc(this.startMs).stripZone();
 		}
 	},
 
+	// Returns an ambig-zoned moment from startMs.
+	// BEWARE: returned moment is not localized.
+	// Formatting and start-of-week will be default.
 	getEnd: function() {
 		if (this.endMs !== null) {
 			return FC.moment.utc(this.endMs).stripZone();