From 4a01f97eb8ad93bdc03c25f95847a72eefe3a09e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 17 Sep 2020 14:55:46 +0800 Subject: [PATCH] put the optional values in the values property --- roojspacker/DocBuilder.vala | 2 +- roojspacker/DocTag.vala | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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++) { -- 2.39.2