deploy: 1fe330f

api/design.js.html

@@ -195,7 +195,7 @@
 
 let icalParams = {
   // Although the syntax is DQUOTE uri DQUOTE, I don't think we should
-  // enfoce anything aside from it being a valid content line.
+  // enforce anything aside from it being a valid content line.
   //
   // At least some params require - if multi values are used - DQUOTEs
   // for each of its values - e.g. delegated-from="uri1","uri2"

api/stringify.js.html

@@ -118,20 +118,23 @@
     if (designSet.propertyGroups && paramName == 'group') {
       continue;
     }
-    let multiValue = (paramName in designSet.param) && designSet.param[paramName].multiValue;
+
+    let paramDesign = designSet.param[paramName];
+    let multiValue = paramDesign && paramDesign.multiValue;
     if (multiValue && Array.isArray(value)) {
-      if (designSet.param[paramName].multiValueSeparateDQuote) {
-        multiValue = '"' + multiValue + '"';
-      }
-      value = value.map(stringify._rfc6868Unescape);
+      value = value.map(function(val) {
+        val = stringify._rfc6868Unescape(val);
+        val = stringify.paramPropertyValue(val, paramDesign.multiValueSeparateDQuote);
+        return val;
+      });
       value = stringify.multiValue(value, multiValue, "unknown", null, designSet);
     } else {
       value = stringify._rfc6868Unescape(value);
+      value = stringify.paramPropertyValue(value);
     }
 
 
-    line += ';' + paramName.toUpperCase();
-    line += '=' + stringify.propertyValue(value);
+    line += ';' + paramName.toUpperCase() + '=' + value;
   }
 
   if (property.length === 3) {
@@ -208,13 +211,14 @@
  * If any of the above are present the result is wrapped
  * in double quotes.
  *
- * @function ICAL.stringify.propertyValue
+ * @function ICAL.stringify.paramPropertyValue
  * @param {String} value      Raw property value
+ * @param {boolean} force     If value should be escaped even when unnecessary
  * @return {String}           Given or escaped value when needed
  */
-stringify.propertyValue = function(value) {
-
-  if ((unescapedIndexOf(value, ',') === -1) &&
+stringify.paramPropertyValue = function(value, force) {
+  if (!force &&
+      (unescapedIndexOf(value, ',') === -1) &&
       (unescapedIndexOf(value, ':') === -1) &&
       (unescapedIndexOf(value, ';') === -1)) {