Merge pull request #11 from doyle-johnpaul/SMP941_Compatibility_Release

Smp941 compatibility release
doyle-johnpaul · Jul 17, 2020 · 4d24e3b · 4d24e3b
2 parents 16f36b5 + fa565ae
commit 4d24e3b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/custom_ROToolbox.js b/custom_ROToolbox.js
@@ -288,7 +288,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];
@@ -1660,4 +1661,4 @@ function tbxDatePicker  (targetEle, settings) {
 			$(this).parents(".form-group").removeClass('has-error');
 		}
 	});
-}
+}