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

FIX: more resilient/consistent date-picker loading (#9817)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2020-05-18 15:29:24 +02:00
committed by GitHub
parent 48ed1b40cf
commit 1876b3cc4c
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/assets/javascripts/discourse/app/components/date-input.js
View File

@ -1,3 +1,4 @@
import { Promise } from "rsvp";
import I18n from "I18n";
import { schedule } from "@ember/runloop";
import { action } from "@ember/object";
@ -16,20 +17,34 @@ export default Component.extend({
return mobileView ? "date" : "text";
},
@on("didInsertElement")
_loadDatePicker() {
click(event) {
event.stopPropagation();
},
didInsertElement() {
this._super(...arguments);
schedule("afterRender", () => {
const container = this.element.querySelector(`#${this.containerId}`);
if (!this.element || this.isDestroying || this.isDestroying) {
return;
}
let promise;
const container = document.getElementById(this.containerId);
if (this.site.mobileView) {
this._loadNativePicker(container);
promise = this._loadNativePicker(container);
} else {
this._loadPikadayPicker(container);
promise = this._loadPikadayPicker(container);
}
if (this._picker && this.date) {
this._picker.setDate(moment(this.date).toDate(), true);
}
promise.then(picker => {
this._picker = picker;
if (this._picker && this.date) {
this._picker.setDate(moment(this.date).toDate(), true);
}
});
});
},
@ -50,7 +65,7 @@ export default Component.extend({
},
_loadPikadayPicker(container) {
loadScript("/javascripts/pikaday.js").then(() => {
return loadScript("/javascripts/pikaday.js").then(() => {
let defaultOptions = {
field: this.element.querySelector(".date-picker"),
container: container || this.element.querySelector(".picker-container"),
@ -73,10 +88,7 @@ export default Component.extend({
});
}
this._picker = new Pikaday(
Object.assign({}, defaultOptions, this._opts())
);
this._picker.setDate(moment(this.date).toDate(), true);
return new Pikaday(Object.assign({}, defaultOptions, this._opts()));
});
},
@ -96,11 +108,12 @@ export default Component.extend({
picker.setMinDate = date => {
picker.min = date;
};
this._picker = picker;
if (this.date) {
picker.setDate(this.date);
}
return Promise.resolve(picker);
},
_handleSelection(value) {