Merge branch 'SMP941_Compatibility_Release' of https://github.com/doy…

…le-johnpaul/ROToolbox into SMP941_Compatibility_Release
doyle-johnpaul · Apr 15, 2021 · 6c4660a · 6c4660a
2 parents 7eb2c9a + fa565ae
commit 6c4660a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/custom_ROToolbox.js b/custom_ROToolbox.js
@@ -291,7 +291,8 @@ function transformRO() {
 
 function parseOptions(controlName, control) {
     var properties = "{}";
-    var regExp = /({[^}]+})/;
+    var rex = controlName + "(.*)";
+    var regExp = new RegExp(rex);
     var matches = regExp.exec(control.text());
     if (matches && matches[1])
         properties = matches[1];
@@ -1655,4 +1656,4 @@ function tbxDatePicker  (targetEle, settings) {
 			$(this).parents(".form-group").removeClass('has-error');
 		}
 	});
-}
+}