diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-06-18 15:56:31 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-06-18 15:56:31 +0900 |
| commit | 048d88b784a6a570f85e1f125a90861e2fd6f39b (patch) | |
| tree | b3ffb447a38e1280fa1375b9e5081e39ef941914 /src | |
| parent | Provide version of postgresql (diff) | |
| parent | Resolve #5069 (#5070) (diff) | |
| download | sharkey-048d88b784a6a570f85e1f125a90861e2fd6f39b.tar.gz sharkey-048d88b784a6a570f85e1f125a90861e2fd6f39b.tar.bz2 sharkey-048d88b784a6a570f85e1f125a90861e2fd6f39b.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/poll-editor.vue | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/poll-editor.vue b/src/client/app/common/views/components/poll-editor.vue index ed1d02aa2c..f7a4d3af8c 100644 --- a/src/client/app/common/views/components/poll-editor.vue +++ b/src/client/app/common/views/components/poll-editor.vue @@ -89,9 +89,7 @@ export default Vue.extend({ get() { const at = () => { - const [date] = moment(this.atDate).toISOString().split('T'); - const [hour, minute] = this.atTime.split(':'); - return moment(`${date}T${hour}:${minute}Z`).valueOf(); + return moment(`${this.atDate} ${this.atTime}`).valueOf(); }; const after = () => { |