diff options
| author | 蔡仲明 (Romulus Urakagi Tsai) <urakagi@gmail.com> | 2019-11-21 11:25:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-21 11:25:56 +0800 |
| commit | 3e0bedd8c7a6dec97352212adb1cbde1ade44190 (patch) | |
| tree | 651ff30d25ddb0416444370368d699e597c142d7 /client/lib/datepicker.js | |
| parent | 9bbeb73db1cd0ce1caaaca8dfb14ea92131bbf9d (diff) | |
| parent | 4f5de87cc4c2281bd576548693de7c94e6a988c6 (diff) | |
| download | wekan-3e0bedd8c7a6dec97352212adb1cbde1ade44190.tar.gz wekan-3e0bedd8c7a6dec97352212adb1cbde1ade44190.tar.bz2 wekan-3e0bedd8c7a6dec97352212adb1cbde1ade44190.zip | |
Merge pull request #1 from wekan/master
Update master
Diffstat (limited to 'client/lib/datepicker.js')
| -rw-r--r-- | client/lib/datepicker.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/client/lib/datepicker.js b/client/lib/datepicker.js index eb5b60b8..8ad66c5f 100644 --- a/client/lib/datepicker.js +++ b/client/lib/datepicker.js @@ -3,10 +3,11 @@ DatePicker = BlazeComponent.extendComponent({ return 'datepicker'; }, - onCreated() { + onCreated(defaultTime = '1970-01-01 08:00:00') { this.error = new ReactiveVar(''); this.card = this.data(); this.date = new ReactiveVar(moment.invalid()); + this.defaultTime = defaultTime; }, onRendered() { @@ -21,7 +22,15 @@ DatePicker = BlazeComponent.extendComponent({ function(evt) { this.find('#date').value = moment(evt.date).format('L'); this.error.set(''); - this.find('#time').focus(); + const timeInput = this.find('#time'); + timeInput.focus(); + if (!timeInput.value) { + const currentHour = evt.date.getHours(); + const defaultMoment = moment( + currentHour > 0 ? evt.date : this.defaultTime, + ); // default to 8:00 am local time + timeInput.value = defaultMoment.format('LT'); + } }.bind(this), ); |