From 8a3ac72cbeffd467d3a64832621dae7666005a6f Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 28 Aug 2019 11:10:27 +0200 Subject: [PATCH] feat(datepicker): also parse manual input in internal format --- frontend/src/utils/form/datepicker.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js index 4891415c2..dbc1ee1a1 100644 --- a/frontend/src/utils/form/datepicker.js +++ b/frontend/src/utils/form/datepicker.js @@ -151,7 +151,10 @@ export class Datepicker { const setDatepickerDate = () => { const parsedMomentDate = moment(this._element.value, FORM_DATE_FORMAT_MOMENT[this.elementType]); - if (parsedMomentDate.isValid()) { + const parsedMomentDateInternal = moment(this._element.value, FORM_DATE_FORMAT[this.elementType]); + + // only set the datepicker date if the input is either in valid fancy format or in valid internal format + if (parsedMomentDate.isValid() || parsedMomentDateInternal.isValid()) { this.datepickerInstance.selectDate(parsedMomentDate.toDate()); } // reregister change event to prevent event loop