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

FIX: Bugs with year selector and erase button (#17749)

Browse Source
This commit is contained in:
Penar Musaraj
2022-08-02 09:58:38 -04:00
committed by GitHub
parent 381365facc
commit a799268b66
3 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,22 +401,22 @@ export default Component.extend({
},
_setPickerMinDate(date) {
if (date && !moment(date, this.dateFormat).isValid()) {
date = null;
}
schedule("afterRender", () => {
this._picker.setMinDate(moment(date, this.dateFormat).toDate());
if (moment(date, this.dateFormat).isValid()) {
this._picker.setMinDate(moment(date, this.dateFormat).toDate());
} else {
this._picker.setMinDate(null);
}
});
},
_setPickerDate(date) {
if (date && !moment(date, this.dateFormat).isValid()) {
date = null;
}
schedule("afterRender", () => {
this._picker.setDate(moment.utc(date), true);
if (moment(date, this.dateFormat).isValid()) {
this._picker.setDate(moment.utc(date), true);
} else {
this._picker.setDate(null);
}
});
},

2
plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
View File

@ -34,7 +34,7 @@
@translatedLabel={{this.formattedTo}}
@class="date-time" />
{{#if this.toFilled}}
<DButton @icon="times" action={{action "eraseToDateTime"}} @class="delete-to-date" />
<DButton @icon="times" @action={{action "eraseToDateTime"}} @class="delete-to-date" />
{{/if}}
</div>