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

FIX: Support for local-date email preview without time attribute

Browse Source
This commit is contained in:
Vinoth Kannan
2018-10-16 16:19:43 +05:30
parent e3c6dd26c4
commit bfa25487eb
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,19 +32,20 @@ function addLocalDate(buffer, matches, state) {
["data-timezones", state.md.utils.escapeHtml(config.timezones)]
];
let dateTime = config.date;
if (config.time) {
token.attrs.push(["data-time", state.md.utils.escapeHtml(config.time)]);
dateTime = `${dateTime} ${config.time}`;
}
let dateTime;
if (config.timezone) {
token.attrs.push([
"data-timezone",
state.md.utils.escapeHtml(config.timezone)
]);
dateTime = moment.tz(`${config.date} ${config.time}`, config.timezone);
dateTime = moment.tz(dateTime, config.timezone);
} else {
dateTime = moment.utc(`${config.date} ${config.time}`);
dateTime = moment.utc(dateTime);
}
if (config.recurring) {