IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: simplifies the same day hour to hour use case in local dates

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-06-25 22:16:07 +02:00 committed by GitHub
parent 24dfa1b657
commit acd1693dac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
View File

@ -82,10 +82,15 @@ export default Ember.Component.extend({
"timezones"
)
_setConfig() {
const toTime = this.get("toTime");
if (toTime && !this.get("toDate")) {
this.set("toDate", moment().format(this.dateFormat));
}
const date = this.get("date");
const toDate = this.get("toDate");
const time = this.get("time");
const toTime = this.get("toTime");
const recurring = this.get("recurring");
const format = this.get("format");
const timezones = this.get("timezones");
@ -125,7 +130,7 @@ export default Ember.Component.extend({
config.toTime = toDateTime.format(this.timeFormat);
}
if (!time && !toTime && ["LLL", "LLLL", "LLLLL"].includes(format)) {
if (!time && !toTime && this.get("formats").includes(format)) {
config.format = "LL";
}
@ -133,6 +138,15 @@ export default Ember.Component.extend({
config.toDateTime = toDateTime;
}
if (
time &&
toTime &&
date === toDate &&
this.get("formats").includes(format)
) {
config.format = "LT";
}
this.set("config", config);
},