Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-5688: Fixed flatpicker wrong convert on init #792

Merged
merged 7 commits into from
May 23, 2023
Merged

IBX-5688: Fixed flatpicker wrong convert on init #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b399ade
IBX-5688: Fixed flatpicker wrong convert on init
Gengar-i May 12, 2023
ca4cb3d
using moment instead of Date
Gengar-i May 12, 2023
76552cd
fix convert date to user timezone
Gengar-i May 18, 2023
a119090
adding helper for guessing user timezone
Gengar-i May 19, 2023
5850203
remove moment from admin.picker
Gengar-i May 19, 2023
85a8809
renamed helper to browserTimezone
Gengar-i May 19, 2023
aab32da
renamed local timezone method
Gengar-i May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/bundle/Resources/public/js/scripts/admin.picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
const SELECTOR_PICKER_INPUT = '.ibexa-date-time-picker__input';
const SELECTOR_FORM_INPUT = '.ibexa-picker__form-input';
const pickers = doc.querySelectorAll(SELECTOR_PICKER);
const { formatShortDateTime } = ibexa.helpers.timezone;
const { formatShortDateTime, convertDateToTimezone, getBrowserTimezone } = ibexa.helpers.timezone;
const userTimezone = ibexa.adminUiConfig.timezone;
const pickerConfig = {
enableTime: true,
time_24hr: true,
Expand All @@ -23,7 +24,12 @@
let defaultDate;

if (formInput.value) {
defaultDate = new Date(formInput.value * 1000);
const date = new Date(formInput.value * 1000);
const dateWithUserTimezone = convertDateToTimezone(date, userTimezone);
const localTimezone = getBrowserTimezone();
const convertedDate = convertDateToTimezone(dateWithUserTimezone, localTimezone, true).format();

defaultDate = convertedDate;
}

const dateTimePickerWidget = new ibexa.core.DateTimePicker({
Expand All @@ -40,4 +46,4 @@
};

pickers.forEach(initFlatPickr);
})(window, window.document, window.ibexa, window.flatpickr);
})(window, window.document, window.ibexa);
4 changes: 4 additions & 0 deletions src/bundle/Resources/public/js/scripts/helpers/timezone.helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@
const formatShortDateTime = (date, timezone = userPreferredTimezone, format = userPreferredShortDateTimeFormat) => {
return formatDate(date, timezone, format);
};
const getBrowserTimezone = () => {
return Intl.DateTimeFormat().resolvedOptions().timeZone;
};

ibexa.addConfig('helpers.timezone', {
convertDateToTimezone,
formatFullDateTime,
formatShortDateTime,
getBrowserTimezone,
});
})(window, window.document, window.ibexa, window.moment);