diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-09-28 14:56:51 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-09-28 14:56:51 +0300 |
| commit | 5d6c68a9cfe1e83b884e3884e17d5ed82d6f5b98 (patch) | |
| tree | 9f2a26c68e81419d469d33693217aa492ec26081 /client/lib/datepicker.js | |
| parent | 75dc5f226cb3261337c9be9614856efc0b40e377 (diff) | |
| parent | ed4c49090abfb35ebadc77b40eee4af05ae15ac1 (diff) | |
| download | wekan-5d6c68a9cfe1e83b884e3884e17d5ed82d6f5b98.tar.gz wekan-5d6c68a9cfe1e83b884e3884e17d5ed82d6f5b98.tar.bz2 wekan-5d6c68a9cfe1e83b884e3884e17d5ed82d6f5b98.zip | |
Merge branch 'master' of github.com:wekan/wekan
Diffstat (limited to 'client/lib/datepicker.js')
| -rw-r--r-- | client/lib/datepicker.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/client/lib/datepicker.js b/client/lib/datepicker.js index eb5b60b8..da44bbc5 100644 --- a/client/lib/datepicker.js +++ b/client/lib/datepicker.js @@ -21,7 +21,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 : '1970-01-01 08:00:00', + ); // default to 8:00 am local time + timeInput.value = defaultMoment.format('LT'); + } }.bind(this), ); |