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

UX: Make time attribute optional and set default timezones

Browse Source
This commit is contained in:
Vinoth Kannan
2018-10-12 03:11:57 +05:30
parent 13b3cead06
commit ee9d4f5516
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@
options.date = $this.attr("data-date"); options.date = $this.attr("data-date");
options.time = $this.attr("data-time"); options.time = $this.attr("data-time");
options.recurring = $this.attr("data-recurring"); options.recurring = $this.attr("data-recurring");
options.timezones = $this.attr("data-timezones") || "Etc/UTC"; options.timezones = $this.attr("data-timezones");
options.forceTimezone = $this.attr("data-force-timezone"); options.forceTimezone = $this.attr("data-force-timezone");
processElement($this, options); processElement($this, options);

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

@ -8,7 +8,7 @@ function addLocalDate(buffer, matches, state) {
time: null, time: null,
forceTimezone: null, forceTimezone: null,
format: "YYYY-MM-DD HH:mm:ss", format: "YYYY-MM-DD HH:mm:ss",
timezones: "" timezones: "Etc/UTC"
}; };
let parsed = parseBBCodeTag( let parsed = parseBBCodeTag(
@ -28,11 +28,17 @@ function addLocalDate(buffer, matches, state) {
token.attrs = [ token.attrs = [
["class", "discourse-local-date"], ["class", "discourse-local-date"],
["data-date", state.md.utils.escapeHtml(config.date)], ["data-date", state.md.utils.escapeHtml(config.date)],
["data-time", state.md.utils.escapeHtml(config.time)],
["data-format", state.md.utils.escapeHtml(config.format)], ["data-format", state.md.utils.escapeHtml(config.format)],
["data-timezones", state.md.utils.escapeHtml(config.timezones)] ["data-timezones", state.md.utils.escapeHtml(config.timezones)]
]; ];
if (config.time) {
token.attrs.push([
"data-time",
state.md.utils.escapeHtml(config.time)
]);
}
let dateTime; let dateTime;
if (config.forceTimezone) { if (config.forceTimezone) {
token.attrs.push([ token.attrs.push([