Merge pull request #13 from saicheck2233/issue#59

Issue#59: Remove colon from the title
saicheck2233 · Jul 11, 2023 · c1d846e · c1d846e
2 parents 235f79d + 1ef0e5e
commit c1d846e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -32,11 +32,13 @@
         <script src="src/js/brutusin-json-forms-bootstrap.js"></script>
         <script lang="javascript">
             var BrutusinForms = brutusin["json-forms"];
-            BrutusinForms.bootstrap.addFormatDecorator("inputstream", "file", "glyphicon-search", function (element) {
+            BrutusinForms.bootstrap.addFormatDecorator("inputstream", "file", "glyphicon-search", null, function (element) {
                 alert("user callback on element " + element)
             });
             BrutusinForms.bootstrap.addFormatDecorator("color", "color");
             BrutusinForms.bootstrap.addFormatDecorator("date", "date");
+            //Title decorator
+            BrutusinForms.bootstrap.addFormatDecorator(null, null, null, ":");
             var codeMirrors = new Object();
             var input = new Object();
             var inputString = new Object();

diff --git a/src/js/brutusin-json-forms-bootstrap.js b/src/js/brutusin-json-forms-bootstrap.js
@@ -155,7 +155,7 @@ if (("undefined" === typeof $ || "undefined" === typeof $.fn || "undefined" ===
     });
     BrutusinForms.bootstrap = new Object();
 // helper button for string (with format) fields
-    BrutusinForms.bootstrap.addFormatDecorator = function (format, inputType, glyphicon, cb) {
+    BrutusinForms.bootstrap.addFormatDecorator = function (format, inputType, glyphicon, titleDecorator, cb) {
         BrutusinForms.addDecorator(function (element, schema) {
             if (element.tagName) {
                 var tagName = element.tagName.toLowerCase();
@@ -187,6 +187,13 @@ if (("undefined" === typeof $ || "undefined" === typeof $.fn || "undefined" ===
                     }
                 }
             }
+
+            if (element instanceof Text) {
+                var tagName = element.parentElement.tagName.toLowerCase();
+                if (tagName === "label" && titleDecorator) {
+                    element.textContent = element.textContent + titleDecorator;
+                }
+            }
         });
     };
     BrutusinForms.bootstrap.showLoading = function (element) {

diff --git a/src/js/brutusin-json-forms.js b/src/js/brutusin-json-forms.js
@@ -1176,7 +1176,7 @@ if (typeof brutusin === "undefined") {
                     if (schema.type !== "any" && schema.type !== "object" && schema.type !== "array") {
                         titleLabel.htmlFor = getInputId();
                     }
-                    var titleNode = document.createTextNode(title + ":");
+                    var titleNode = document.createTextNode(title);
                     appendChild(titleLabel, titleNode, schema);
                     if (schema.description) {
                         titleLabel.title = schema.description;