mirror of https://github.com/nextcloud/calendar
Merge pull request #3251 from nextcloud/chore/caldav-trashbin-iso-timestamps
Use ISO8601 timestamps for the CalDAV trashbin
This commit is contained in:
commit
378b39e1ec
|
@ -6760,7 +6760,7 @@
|
|||
"dev": true
|
||||
},
|
||||
"cdav-library": {
|
||||
"version": "git+https://github.com/nextcloud/cdav-library.git#b7a567e2cff9459634e6801719ad780d4a087bbd",
|
||||
"version": "git+https://github.com/nextcloud/cdav-library.git#8a8d42fad2a9bc9567b353c49559438347d110ee",
|
||||
"from": "git+https://github.com/nextcloud/cdav-library.git",
|
||||
"requires": {
|
||||
"core-js": "^3.14.0",
|
||||
|
|
|
@ -9,7 +9,7 @@ export default {
|
|||
name: 'Moment',
|
||||
props: {
|
||||
timestamp: {
|
||||
type: Number,
|
||||
type: [Date, Number],
|
||||
required: true,
|
||||
},
|
||||
format: {
|
||||
|
@ -19,10 +19,16 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
title() {
|
||||
return moment.unix(this.timestamp).format(this.format)
|
||||
return moment.unix(this.numericTimestamp).format(this.format)
|
||||
},
|
||||
formatted() {
|
||||
return moment.unix(this.timestamp).fromNow()
|
||||
return moment.unix(this.numericTimestamp).fromNow()
|
||||
},
|
||||
numericTimestamp() {
|
||||
if (this.timestamp instanceof Date) {
|
||||
return this.timestamp.getTime() / 1000
|
||||
}
|
||||
return this.timestamp
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue