github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 05:31:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: better handling of same offset timezones (#6680)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-27 15:17:23 +01:00
committed by GitHub
parent a2bff038e8
commit 3e116bb14e
2 changed files with 114 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
View File

@ -120,10 +120,14 @@
};
};
const compareZones = (timezoneA, timezoneB) => {
return (
moment.tz(timezoneA).utcOffset() === moment.tz(timezoneB).utcOffset()
);
};
const _applyFormatting = (dateTime, displayedTimezone, options) => {
const sameTimezone =
moment.tz(displayedTimezone).utcOffset() ===
moment.tz(moment.tz.guess()).utcOffset();
const sameTimezone = compareZones(displayedTimezone, moment.tz.guess());
const inCalendarRange = dateTime.isBetween(
moment().subtract(2, "days"),
moment().add(2, "days")
@ -196,8 +200,11 @@
const _generatePreviews = (dateTime, displayedTimezone, options) => {
const previewedTimezones = [];
const watchingUserTimezone = moment.tz.guess();
const timezones = options.timezones.filter(
timezone => timezone !== watchingUserTimezone
);
if (displayedTimezone !== watchingUserTimezone) {
if (!compareZones(displayedTimezone, watchingUserTimezone)) {
previewedTimezones.push({
timezone: watchingUserTimezone,
current: true,
@ -207,18 +214,41 @@
});
}
options.timezones
.filter(x => x !== watchingUserTimezone)
.forEach(timezone => {
previewedTimezones.push({
timezone,
dateTime: options.time
? dateTime.tz(timezone).format("LLL")
: createDateTimeRange(dateTime, timezone)
});
});
if (
displayedTimezone === watchingUserTimezone &&
options.timezone !== displayedTimezone &&
!compareZones(displayedTimezone, options.timezone)
) {
timezones.unshift(options.timezone);
}
return previewedTimezones;
timezones.forEach(timezone => {
if (compareZones(timezone, displayedTimezone)) {
return;
}
if (compareZones(timezone, watchingUserTimezone)) {
timezone = watchingUserTimezone;
}
previewedTimezones.push({
timezone,
dateTime: options.time
? dateTime.tz(timezone).format("LLL")
: createDateTimeRange(dateTime, timezone)
});
});
if (!previewedTimezones.length) {
previewedTimezones.push({
timezone: "Etc/UTC",
dateTime: options.time
? dateTime.tz("Etc/UTC").format("LLL")
: createDateTimeRange(dateTime, "Etc/UTC")
});
}
return _.uniq(previewedTimezones, "timezone");
};
const _generateTextPreview = previews => {