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

FIX: improves code, tests and utc handling of local-dates (#6644)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-22 17:19:24 +01:00
committed by GitHub
parent 56478166e5
commit 3ff3bb6e2a
8 changed files with 435 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/discourse-local-dates/assets/javascripts/lib/discourse-markdown/discourse-local-dates.js.es6
View File

@ -7,8 +7,9 @@ function addLocalDate(buffer, matches, state) {
date: null,
time: null,
timezone: null,
format: "YYYY-MM-DD HH:mm:ss",
timezones: "Etc/UTC"
format: null,
timezones: null,
displayedZone: null
};
let parsed = parseBBCodeTag(
@ -18,18 +19,18 @@ function addLocalDate(buffer, matches, state) {
);
config.date = parsed.attrs.date;
config.format = parsed.attrs.format;
config.calendar = parsed.attrs.calendar;
config.time = parsed.attrs.time;
config.timezone = parsed.attrs.timezone;
config.recurring = parsed.attrs.recurring;
config.format = parsed.attrs.format || config.format;
config.timezones = parsed.attrs.timezones || config.timezones;
config.timezones = parsed.attrs.timezones;
config.displayedZone = parsed.attrs.displayedZone;
token = new state.Token("span_open", "span", 1);
token.attrs = [
["class", "discourse-local-date"],
["data-date", state.md.utils.escapeHtml(config.date)],
["data-format", state.md.utils.escapeHtml(config.format)],
["data-timezones", state.md.utils.escapeHtml(config.timezones)]
["data-date", state.md.utils.escapeHtml(config.date)]
];
let dateTime = config.date;
@ -38,6 +39,31 @@ function addLocalDate(buffer, matches, state) {
dateTime = `${dateTime} ${config.time}`;
}
if (config.format) {
token.attrs.push(["data-format", state.md.utils.escapeHtml(config.format)]);
}
if (config.calendar) {
token.attrs.push([
"data-calendar",
state.md.utils.escapeHtml(config.calendar)
]);
}
if (config.displayedZone) {
token.attrs.push([
"data-displayed-zone",
state.md.utils.escapeHtml(config.displayedZone)
]);
}
if (config.timezones) {
token.attrs.push([
"data-timezones",
state.md.utils.escapeHtml(config.timezones)
]);
}
if (config.timezone) {
token.attrs.push([
"data-timezone",
@ -54,10 +80,11 @@ function addLocalDate(buffer, matches, state) {
state.md.utils.escapeHtml(config.recurring)
]);
}
buffer.push(token);
let emailPreview;
const emailTimezone = config.timezones.split("|")[0];
const emailTimezone = (config.timezones || "Etc/UTC").split("|")[0];
const formattedDateTime = dateTime.tz(emailTimezone).format(config.format);
const formattedTimezone = emailTimezone.replace("/", ": ").replace("_", " ");
@ -66,7 +93,6 @@ function addLocalDate(buffer, matches, state) {
} else {
emailPreview = `${formattedDateTime} (${formattedTimezone})`;
}
token.attrs.push(["data-email-preview", emailPreview]);
token = new state.Token("text", "", 0);
@ -74,6 +100,7 @@ function addLocalDate(buffer, matches, state) {
buffer.push(token);
token = new state.Token("span_close", "span", -1);
buffer.push(token);
}