nextcloud
/
calendar
mirror of https://github.com/nextcloud/calendar
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3320 from nextcloud/backport/3313/stable2.3 

[stable2.3] Use nullish coalescing operator in editor mixin
This commit is contained in:
Richard Steinmetz 2021-07-12 14:33:52 +02:00 committed by GitHub
parent ac7ee9ab80 aab7cdcafb
commit ae2909b305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mixins/EditorMixin.js
View File

@ -77,7 +77,7 @@ export default {
* @returns {string} * @returns {string}
*/ */
title() { title() {
return this.calendarObjectInstance?.title || '' return this.calendarObjectInstance?.title ?? ''
}, },
/** /**
* Returns the location or null if the event is still loading * Returns the location or null if the event is still loading
@ -85,7 +85,7 @@ export default {
* @returns {string|null} * @returns {string|null}
*/ */
location() { location() {
return this.calendarObjectInstance?.location || null return this.calendarObjectInstance?.location ?? null
}, },
/** /**
* Returns the description or null if the event is still loading * Returns the description or null if the event is still loading
@ -93,7 +93,7 @@ export default {
* @returns {string|null} * @returns {string|null}
*/ */
description() { description() {
return this.calendarObjectInstance?.description || null return this.calendarObjectInstance?.description ?? null
}, },
/** /**
* Returns the start-date (without timezone) or null if the event is still loading * Returns the start-date (without timezone) or null if the event is still loading
@ -101,7 +101,7 @@ export default {
* @returns {Date|null} * @returns {Date|null}
*/ */
startDate() { startDate() {
return this.calendarObjectInstance?.startDate || null return this.calendarObjectInstance?.startDate ?? null
}, },
/** /**
* Returns the timezone of the event's start-date or null if the event is still loading * Returns the timezone of the event's start-date or null if the event is still loading
@ -109,7 +109,7 @@ export default {
* @returns {string|null} * @returns {string|null}
*/ */
startTimezone() { startTimezone() {
return this.calendarObjectInstance?.startTimezoneId || null return this.calendarObjectInstance?.startTimezoneId ?? null
}, },
/** /**
* Returns the end-date (without timezone) or null if the event is still loading * Returns the end-date (without timezone) or null if the event is still loading
@ -117,7 +117,7 @@ export default {
* @returns {Date|null} * @returns {Date|null}
*/ */
endDate() { endDate() {
return this.calendarObjectInstance?.endDate || null return this.calendarObjectInstance?.endDate ?? null
}, },
/** /**
* Returns the timezone of the event's end-date or null if the event is still loading * Returns the timezone of the event's end-date or null if the event is still loading
@ -125,7 +125,7 @@ export default {
* @returns {string|null} * @returns {string|null}
*/ */
endTimezone() { endTimezone() {
return this.calendarObjectInstance?.endTimezoneId || null return this.calendarObjectInstance?.endTimezoneId ?? null
}, },
/** /**
* Returns whether or not the event is all-day or null if the event is still loading * Returns whether or not the event is all-day or null if the event is still loading
@ -133,7 +133,7 @@ export default {
* @returns {boolean} * @returns {boolean}
*/ */
isAllDay() { isAllDay() {
return this.calendarObjectInstance?.isAllDay || false return this.calendarObjectInstance?.isAllDay ?? false
}, },
/** /**
* Returns whether or not the user is allowed to modify the all-day setting * Returns whether or not the user is allowed to modify the all-day setting
@ -141,7 +141,7 @@ export default {
* @returns {boolean} * @returns {boolean}
*/ */
canModifyAllDay() { canModifyAllDay() {
return this.calendarObjectInstance?.canModifyAllDay || null return this.calendarObjectInstance?.canModifyAllDay ?? false
}, },
/** /**
* Returns an illustration matching this event's title * Returns an illustration matching this event's title
@ -183,7 +183,7 @@ export default {
* @returns {null|String} * @returns {null|String}
*/ */
color() { color() {
return this.calendarObjectInstance?.customColor || null return this.calendarObjectInstance?.customColor ?? null
}, },
/** /**
* Returns whether or not to display save buttons * Returns whether or not to display save buttons