Przeglądaj źródła

fix for event rendering with negative minTime

Adam Shaw 9 lat temu
rodzic
commit
88fa177dda

+ 3 - 3
src/common/TimeGrid.js

@@ -280,10 +280,10 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 		var dayRange;
 
 		for (dayIndex = 0; dayIndex < this.daysPerRow; dayIndex++) {
-			dayDate = this.dayDates[dayIndex].clone(); // TODO: better API for this?
+			dayDate = this.dayDates[dayIndex].clone().time(0); // TODO: better API for this?
 			dayRange = {
-				start: dayDate.clone().time(this.view.minTime),
-				end: dayDate.clone().time(this.view.maxTime)
+				start: dayDate.clone().add(this.view.minTime), // don't use .time() because it sux with negatives
+				end: dayDate.clone().add(this.view.maxTime)
 			};
 			seg = intersectRanges(range, dayRange); // both will be ambig timezone
 			if (seg) {

+ 1 - 1
tests/automated-better/event-render/minTime.js

@@ -14,7 +14,7 @@ describe('event rendering with minTime', function() {
 			]
 		});
 
-		xit('renders two event elements in the correct places', function() {
+		it('renders two event elements in the correct places', function() {
 			initCalendar();
 			var res = TimeGridEventRenderUtils.checkEventRendering(
 				'2017-03-22T22:00:00',