Skip to content

Commit 5cda641

Browse files
committed
fix bug with timeline event rendering and minTime. closes #78
1 parent 980be02 commit 5cda641

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

src/timeline/TimelineGrid.coffee

+4-2
Original file line numberDiff line numberDiff line change
@@ -620,11 +620,13 @@ class TimelineGrid extends Grid
620620
@snapCnt
621621
else
622622
snapDiffInt = Math.floor(snapDiff)
623-
snapDiffRemainder = snapDiff - snapDiffInt
624623
snapCoverage = @snapDiffToIndex[snapDiffInt]
625624

626625
if isInt(snapCoverage) # not an in-between value
627-
snapCoverage += snapDiffRemainder
626+
snapCoverage += snapDiff - snapDiffInt # add the remainder
627+
else
628+
# in between, so round down, but make sure negatives go to zero
629+
snapCoverage = Math.max(0, Math.floor(snapCoverage))
628630

629631
snapCoverage
630632

tests/timeline-event-rendering.coffee

+23
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,29 @@ describe 'timeline event rendering', ->
113113
expect(Math.abs(eventEl.outerHeight() - canvasEl.height())).toBeLessThan(3)
114114
done()
115115

116+
it 'renders correctly when cropped by minTime', (done) ->
117+
initCalendar
118+
minTime: '03:00'
119+
events: [
120+
makeEvent('event1', '2015-10-17T02:00:00', '2015-10-17T06:00:00')
121+
]
122+
eventAfterAllRender: ->
123+
expectEventSlotSpan('event1', '3am', '5am')
124+
expectEventIsStartEnd('event1', false, true)
125+
done()
126+
127+
it 'renders correctly when cropped by maxTime', (done) ->
128+
initCalendar
129+
scrollTime: '24:00' # the most possible
130+
maxTime: '21:00' # last slot will be 8pm-9pm
131+
events: [
132+
makeEvent('event1', '2015-10-17T19:00:00', '2015-10-18T02:00:00')
133+
]
134+
eventAfterAllRender: ->
135+
expectEventSlotSpan('event1', '7pm', '8pm')
136+
expectEventIsStartEnd('event1', true, false)
137+
done()
138+
116139
###
117140
TODO: inverse-background doesn't work well with events rendered on day-scale or larger.
118141
Problems with Grid's rangeToSegs.

0 commit comments

Comments
 (0)