Skip to content

Commit 3a20004

Browse files
committed
refactor(CDateRangePicker): add localized string to date converter
1 parent f4346e1 commit 3a20004

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

js/src/calendar.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ class Calendar extends BaseComponent {
110110

111111
// Private
112112
_addEventListeners() {
113-
// Cell interactions
114113
EventHandler.on(this._element, 'click', SELECTOR_CALENDAR_CELL_INNER, event => {
115114
event.preventDefault()
116115
if (event.target.classList.contains('day')) {
@@ -362,7 +361,7 @@ class Calendar extends BaseComponent {
362361
isStartDate(date, this._startDate, this._endDate) && 'start',
363362
isEndDate(date, this._startDate, this._endDate) && 'end'
364363
]
365-
return classNames.join(' ')
364+
return classNames.filter(Boolean).join(' ')
366365
}
367366

368367
_getConfig(config) {

js/src/date-range-picker.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { defineJQueryPlugin, typeCheckConfig } from './util/index'
99
import EventHandler from './dom/event-handler'
1010
import Manipulator from './dom/manipulator'
1111
import SelectorEngine from './dom/selector-engine'
12-
import { isValidDate } from './util/calendar'
12+
import { getLocalDateFromString } from './util/calendar'
1313
import Calendar from './calendar'
1414
import Picker from './picker'
1515
import TimePicker from './time-picker'
@@ -185,9 +185,10 @@ class DateRangePicker extends Picker {
185185
})
186186

187187
EventHandler.on(this._startInput, 'input', event => {
188-
if (isValidDate(event.target.value)) {
189-
this._startDate = this._convertStringToDate(event.target.value)
190-
this._calendarDate = this._startDate
188+
const date = getLocalDateFromString(event.target.value, this._config.locale, this._config.timepicker)
189+
if (date instanceof Date && date.getTime()) {
190+
this._startDate = date
191+
this._calendarDate = date
191192
this._updateCalendars()
192193
}
193194
})
@@ -199,9 +200,10 @@ class DateRangePicker extends Picker {
199200
})
200201

201202
EventHandler.on(this._endInput, 'input', event => {
202-
if (isValidDate(event.target.value)) {
203-
this._endDate = this._convertStringToDate(event.target.value)
204-
this._calendarDate = this._endDate
203+
const date = getLocalDateFromString(event.target.value, this._config.locale, this._config.timepicker)
204+
if (date instanceof Date && date.getTime()) {
205+
this._endDate = date
206+
this._calendarDate = date
205207
this._updateCalendars()
206208
}
207209
})

0 commit comments

Comments
 (0)