github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-02 10:16:09 +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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 23 deletions
Show Stats 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 timezone => timezone !== watchingUserTimezone
); );
if (!_isEqualZones(displayedTimezone, watchingUserTimezone)) { previewedTimezones.push({
previewedTimezones.push({ timezone: watchingUserTimezone,
timezone: watchingUserTimezone, current: true,
current: true, dateTime: options.time
dateTime: options.time ? dateTime.tz(watchingUserTimezone).format("LLL")
? dateTime.tz(watchingUserTimezone).format("LLL") : _createDateTimeRange(dateTime, watchingUserTimezone)
: _createDateTimeRange(dateTime, watchingUserTimezone) });
});
}
if ( if (
options.timezone && options.timezone &&

21
plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
View File

@ -331,7 +331,7 @@ test("tooltip", assert => {
assert.equal( assert.equal(
timezone, timezone,
DEFAULT_ZONE_FORMATED, DEFAULT_ZONE_FORMATED,
"it creates a range adjusted to watching user timezone" "it adds watching user timezone as preview"
); );
assert.equal( assert.equal(
dateTime, dateTime,
@ -345,9 +345,9 @@ test("tooltip", assert => {
htmlToolip = transformed.attr("data-html-tooltip"); htmlToolip = transformed.attr("data-html-tooltip");
currentUserPreview = $(htmlToolip).find(".preview.current"); currentUserPreview = $(htmlToolip).find(".preview.current");
assert.notOk( assert.ok(
exists(currentUserPreview), exists(currentUserPreview),
"it doesn’t create entry if watching user has the same timezone than creator" "it creates an entry if watching user has the same timezone than creator"
); );
}); });
@ -360,11 +360,11 @@ test("tooltip", assert => {
htmlToolip = transformed.attr("data-html-tooltip"); htmlToolip = transformed.attr("data-html-tooltip");
assert.ok( assert.ok(
!exists(".preview.current"), exists($(htmlToolip).find(".preview.current")),
"doesn’t create current timezone when displayed timezone equals watching user timezone" "doesn’t create current timezone when displayed timezone equals watching user timezone"
); );
let $firstPreview = $(htmlToolip).find(".preview:nth-child(1)"); let $firstPreview = $(htmlToolip).find(".preview:nth-child(2)");
dateTime = $firstPreview.find(".date-time").text(); dateTime = $firstPreview.find(".date-time").text();
timezone = $firstPreview.find(".timezone").text(); timezone = $firstPreview.find(".timezone").text();
assert.equal( assert.equal(
@ -374,14 +374,9 @@ test("tooltip", assert => {
); );
assert.equal(timezone, "Chicago", "it adds the timezone of the creator"); assert.equal(timezone, "Chicago", "it adds the timezone of the creator");
let $secondPreview = $(htmlToolip).find(".preview:nth-child(2)"); let $secondPreview = $(htmlToolip).find(".preview:nth-child(3)");
dateTime = $secondPreview.find(".date-time").text(); dateTime = $secondPreview.find(".date-time").text();
timezone = $secondPreview.find(".timezone").text(); timezone = $secondPreview.find(".timezone").text();
assert.equal(
dateTime,
"June 20, 2018 7:00 PM",
"it doesn’t create range if time has been set"
);
assert.equal(timezone, "UTC", "Etc/UTC is rewritten to UTC"); assert.equal(timezone, "UTC", "Etc/UTC is rewritten to UTC");
freezeDateAndZone(moment("2018-11-26 21:00:00"), "Europe/Vienna", () => { freezeDateAndZone(moment("2018-11-26 21:00:00"), "Europe/Vienna", () => {
@ -393,9 +388,7 @@ test("tooltip", assert => {
transformed = $(html).applyLocalDates(); transformed = $(html).applyLocalDates();
htmlToolip = transformed.attr("data-html-tooltip"); htmlToolip = transformed.attr("data-html-tooltip");
$firstPreview = $(htmlToolip) $firstPreview = $(htmlToolip).find(".preview:nth-child(2)");
.find(".preview")
.first();
assert.equal( assert.equal(
$firstPreview.find(".timezone").text(), $firstPreview.find(".timezone").text(),