diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-01-04 11:22:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 11:22:38 +0100 |
| commit | ada212cbd1a5beaacee2a87a4d706387ae72222a (patch) | |
| tree | 7f7c03e741032fb0c5de69b33b40e2664963e03e | |
| parent | 48272163072c2309857a804eafc38633f485e586 (diff) | |
| parent | be4d5fc78626fcfc2093e94f1ec1742ce234f180 (diff) | |
Merge pull request #2000 from zlajo/remove_vcard_label_workaround
Remove Workaround for Postal Addresses Containing Commas
| -rw-r--r-- | src/services/updateDesignSet.js | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/services/updateDesignSet.js b/src/services/updateDesignSet.js index 0ad08139..33093f8f 100644 --- a/src/services/updateDesignSet.js +++ b/src/services/updateDesignSet.js @@ -23,32 +23,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 * by Nextcloud Server) that prevents saving vCards with this parameters. @@ -99,7 +73,6 @@ const addGroupedProperties = vCard => { export default function(vCard) { let madeChanges = false - madeChanges |= setLabelAsSingleValue() madeChanges |= removePhoneNumberValueType() madeChanges |= addGroupedProperties(vCard) |