From: Alan Knowles <alan@roojs.com>
Date: Thu, 17 Sep 2020 06:55:46 +0000 (+0800)
Subject: put the optional values in the values property
X-Git-Tag: release-1.5~19
X-Git-Url: http://git.roojs.org/?p=roojspacker;a=commitdiff_plain;h=4a01f97eb8ad93bdc03c25f95847a72eefe3a09e

put the optional values in the values property
---

diff --git a/roojspacker/DocBuilder.vala b/roojspacker/DocBuilder.vala
index bc281c5..49e8965 100644
--- a/roojspacker/DocBuilder.vala
+++ b/roojspacker/DocBuilder.vala
@@ -544,7 +544,7 @@ namespace JSDOC
 		        add.set_string_member("memberOf", p.memberOf == data.alias ? "" : p.memberOf);
 		            
 		        if (p.optvalues.size > 0) {
-		    		add.set_array_member("desc",p.optvalue_as_json_array());
+		    	     add.set_array_member("values",p.optvalue_as_json_array());
 		        }
 		        
 		        props.add_object_element(add );
diff --git a/roojspacker/DocTag.vala b/roojspacker/DocTag.vala
index 49545a6..f4155c8 100644
--- a/roojspacker/DocTag.vala
+++ b/roojspacker/DocTag.vala
@@ -122,6 +122,7 @@ namespace JSDOC
             
             if (this.title ==  DocTagTitle.CFG && /^\([^)]+\)/.match_all(src, 0, out mi )) {
 				var ms = mi.fetch(0);
+				ms = ms.substring(1,ms.length-2);
 				if (ms.contains("|")) {
 					var ar = ms.split("|");
 					for (var i =0 ; i < ar.length;i++) {