opensourcemirror
/
nextcloud-contacts
mirror of https://github.com/nextcloud/contacts.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2000 from zlajo/remove_vcard_label_workaround 

Remove Workaround for Postal Addresses Containing Commas
This commit is contained in:
John Molakvoæ 2021-01-04 11:22:38 +01:00 committed by GitHub
parent 4827216307 be4d5fc786
commit ada212cbd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/services/updateDesignSet.js
View File

@ -22,32 +22,6 @@
*/
import ICAL from 'ical.js'
/**
* Fixes nextcloud/contacts#1009 that prevented editing of contacts if
* their address contained a comma. This is actually a bug in ical.js
* but it has not been fixed for some time now.
*
* This can be removed once https://github.com/mozilla-comm/ical.js/issues/386
* has been resolved.
*
* @returns {Boolean} Whether or not the design set has been altered.
*/
const setLabelAsSingleValue = () => {
if (
!ICAL.design.vcard.param.label
|| ICAL.design.vcard.param.label.multiValue !== false
|| !ICAL.design.vcard3.param.label
|| ICAL.design.vcard3.param.label.multiValue !== false
) {
ICAL.design.vcard.param.label = { multiValue: false }
ICAL.design.vcard3.param.label = { multiValue: false }
return true
}
return false
}
/**
* Prevents ical.js from adding 'VALUE=PHONE-NUMBER' in vCard 3.0.
* While not wrong according to the RFC, there's a bug in sabreio/vobject (used
@ -99,7 +73,6 @@ const addGroupedProperties = vCard => {
export default function(vCard) {
let madeChanges = false
madeChanges |= setLabelAsSingleValue()
madeChanges |= removePhoneNumberValueType()
madeChanges |= addGroupedProperties(vCard)