Skip to content
This repository was archived by the owner on Jan 7, 2022. It is now read-only.

Commit 599faf8

Browse files
committed
Fix max-datetime when time is midnight. Fixes: #215.
1 parent d9f45b7 commit 599faf8

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

src/util.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export function yearIsDisabled (minDate, maxDate, year) {
5353
}
5454

5555
export function timeComponentIsDisabled (min, max, component) {
56-
return (min && component < min) ||
57-
(max && component > max)
56+
return (min !== null && component < min) ||
57+
(max !== null && component > max)
5858
}
5959

6060
export function weekdays (weekStart) {

test/specs/DatetimeTimePicker.spec.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,38 @@ describe('DatetimeTimePicker.vue', function () {
138138
})
139139
})
140140

141+
it('should disable time after max time (midnight)', function () {
142+
const vm = createVM(this,
143+
`<DatetimeTimePicker :hour="0" :minute="0" max-time="00:00"></DatetimeTimePicker>`,
144+
{
145+
components: { DatetimeTimePicker }
146+
})
147+
148+
const hours = vm.$$('.vdatetime-time-picker__list--hours .vdatetime-time-picker__item')
149+
150+
hours.forEach(hour => {
151+
const hourNumber = parseInt(hour.textContent)
152+
153+
if (hourNumber > 0) {
154+
expect(hour).to.have.class('vdatetime-time-picker__item--disabled')
155+
} else {
156+
expect(hour).to.have.not.class('vdatetime-time-picker__item--disabled')
157+
}
158+
})
159+
160+
const minutes = vm.$$('.vdatetime-time-picker__list--minutes .vdatetime-time-picker__item')
161+
162+
minutes.forEach(minute => {
163+
const minuteNumber = parseInt(minute.textContent)
164+
165+
if (minuteNumber > 0) {
166+
expect(minute).to.have.class('vdatetime-time-picker__item--disabled')
167+
} else {
168+
expect(minute).to.have.not.class('vdatetime-time-picker__item--disabled')
169+
}
170+
})
171+
})
172+
141173
it('should render the time picker with am/pm suffixes', function () {
142174
const vm = createVM(this,
143175
`<DatetimeTimePicker :hour="15" :minute="11" use12-hour></DatetimeTimePicker>`,

0 commit comments

Comments
 (0)