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

Rename timezone attribute and add it to local date details field

Browse Source
This commit is contained in:
Vinoth Kannan
2018-10-16 05:04:55 +05:30
parent 8d06731484
commit 2c8c1bf188
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js
View File

@ -12,9 +12,9 @@
}
var relativeTime;
if (options.forceTimezone) {
if (options.timezone) {
relativeTime = moment
.tz(options.date + " " + options.time, options.forceTimezone)
.tz(options.date + " " + options.time, options.timezone)
.utc();
} else {
relativeTime = moment.utc(options.date + " " + options.time);
@ -104,7 +104,7 @@
options.time = $this.attr("data-time") || "00:00:00";
options.recurring = $this.attr("data-recurring");
options.timezones = $this.attr("data-timezones");
options.forceTimezone = $this.attr("data-force-timezone");
options.timezone = $this.attr("data-timezone");
processElement($this, options);
});

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

@ -6,7 +6,7 @@ function addLocalDate(buffer, matches, state) {
let config = {
date: null,
time: null,
forceTimezone: null,
timezone: null,
format: "YYYY-MM-DD HH:mm:ss",
timezones: "Etc/UTC"
};
@ -19,7 +19,7 @@ function addLocalDate(buffer, matches, state) {
config.date = parsed.attrs.date;
config.time = parsed.attrs.time;
config.forceTimezone = parsed.attrs.forceTimezone || parsed.attrs.timezone;
config.timezone = parsed.attrs.timezone;
config.recurring = parsed.attrs.recurring;
config.format = parsed.attrs.format || config.format;
config.timezones = parsed.attrs.timezones || config.timezones;
@ -37,12 +37,12 @@ function addLocalDate(buffer, matches, state) {
}
let dateTime;
if (config.forceTimezone) {
if (config.timezone) {
token.attrs.push([
"data-force-timezone",
state.md.utils.escapeHtml(config.forceTimezone)
"data-timezone",
state.md.utils.escapeHtml(config.timezone)
]);
dateTime = moment.tz(`${config.date} ${config.time}`, config.forceTimezone);
dateTime = moment.tz(`${config.date} ${config.time}`, config.timezone);
} else {
dateTime = moment.utc(`${config.date} ${config.time}`);
}