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

FIX: always prepend watching user timezone to previews (#6695)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-29 12:02:27 +01:00
committed by GitHub
parent 4c7dfed32e
commit 6b433b66f5
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,15 +202,13 @@
timezone => timezone !== watchingUserTimezone
);
if (!_isEqualZones(displayedTimezone, watchingUserTimezone)) {
previewedTimezones.push({
timezone: watchingUserTimezone,
current: true,
dateTime: options.time
? dateTime.tz(watchingUserTimezone).format("LLL")
: _createDateTimeRange(dateTime, watchingUserTimezone)
});
}
previewedTimezones.push({
timezone: watchingUserTimezone,
current: true,
dateTime: options.time
? dateTime.tz(watchingUserTimezone).format("LLL")
: _createDateTimeRange(dateTime, watchingUserTimezone)
});
if (
options.timezone &&