github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 13:51:09 +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);
});