Fix #3966 - Datepicker does not respect locale on first load #4085
Conversation
|
Hey there! :) Thank you very much for offering a contribution to pretix! For legal reasons, we need you to sign a Contributor License Agreement in order to be able to merge the code. Sorry for the hassle :( Please download the agreement from https://pretix.eu/about/en/cla and send a signed copy to [email protected]. Feel free to also contact us there or via comments here if you have any questions! |
raphaelm
changed the title
|
Ah, I just see that this makes changes to the upstream library directly. Is that something we want? If we don't expect the library to ever get updated again, we could. |
| {% bootstrap_field form.payment_banktransfer_bank_details_sepa_name layout="control" %} | ||
| {% bootstrap_field form.payment_banktransfer_bank_details_sepa_iban layout="control" %} | ||
| {% bootstrap_field form.payment_banktransfer_bank_details_sepa_bic layout="control" %} | ||
| {% bootstrap_field form.payment_banktransfer_bank_details_sepa_bank layout="control" %} |
There was a problem hiding this comment.
I think this belongs to your other PR, could you try to separate that?
| @@ -585,7 +585,7 @@ | |||
| var monthsView = widget.find('.datepicker-months'), | |||
| monthsViewHeader = monthsView.find('th'), | |||
| months = monthsView.find('tbody').find('span'); | |||
|
|
|||
| @@ -697,7 +697,7 @@ | |||
| if (!hasDate()) { | |||
| return; | |||
| } | |||
|
|
|||
|
Well, the library has undergone a major rewrite with version 6 AFAICT. Not sure we upgrade, so I guess it is okay to update the current file to fix bugs (not add features), which might not exist in v6 anymore (who knows). I would add a hint at the top, that the library has local edits though. Regarding the changes: in my testing it did not work or at least it did not fix, what it says it would (locale being wrong). It fixes the bug that with a min- or max-date given, when you open the datepicker it displays the min-date month, then close it without selecting a date, then reopen it, it will jump to today. With this PR, it stays on the min-date month. It does not fix the locale bug though – in my testing, the locale is not updated when opening the datepicker a second time. |
|
Not sure why, but this line is commented out, but will set the locale for parsed input-dates (which min/max/viewDate are). Uncommenting this and even maybe moving it to line 963, so it will only set the locale if no custom We might even go so far as to provide our own |
| // PROBLEM IS HERE | ||
| // WHEN YOU CLICK OUT OF WIDGET WITHOUT SELECTING A DATE, date IS CURRENT DATE | ||
| // WHEN YOU SELECT DATE, date STILL JUNE 3 REGARDLESS OF SELECTED DATE | ||
| // THEREFORE, we do not want to set date to viewDate when clicking out of widget | ||
|
|
||
| // date.month() & viewDate.month() will be the same if date selected by user | ||
| // date.month() & viewDate.month() will be different if user clicks out of widget | ||
| // therefore, do not set date to be equal to viewDate if date.month() !== viewDate.month() | ||
| if (date.month() === viewDate.month()) { | ||
| viewDate = date.clone(); | ||
| } |
There was a problem hiding this comment.
AFAICT that line does not help at all. And if date.month() === viewDate.month() there is no practical benefit to set the viewdate to a clone of the original date. So I would just remove the line completely:
| // PROBLEM IS HERE | |
| // WHEN YOU CLICK OUT OF WIDGET WITHOUT SELECTING A DATE, date IS CURRENT DATE | |
| // WHEN YOU SELECT DATE, date STILL JUNE 3 REGARDLESS OF SELECTED DATE | |
| // THEREFORE, we do not want to set date to viewDate when clicking out of widget | |
| // date.month() & viewDate.month() will be the same if date selected by user | |
| // date.month() & viewDate.month() will be different if user clicks out of widget | |
| // therefore, do not set date to be equal to viewDate if date.month() !== viewDate.month() | |
| if (date.month() === viewDate.month()) { | |
| viewDate = date.clone(); | |
| } | |
| // CUSTOM CHANGE: when closing the picker without selecting a date | |
| // this would set the viewDate to basically now() as local var date does | |
| // no respect min- /max-date initially. | |
| // viewDate = date.clone(); |
Datepicker now displays correct min-date after clicking out of widget and back into it (second load).