bugfixing handling of selects and checkboxes / radiobuttons

georgleber · Jun 8, 2016 · 8df0413 · 8df0413
1 parent c4d5d58
commit 8df0413
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 30 deletions.
diff --git a/bower.json b/bower.json
@@ -1,12 +1,12 @@
 {
   "name": "TieJS",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "homepage": "http://develman.github.io/tiejs",
   "description": "TieJS makes it easy to create forms via JSON and bind objects to its form fields. Furthermore it has HTML5 validation functionalities.",
   "main": "dist/tie.min.js",
   "authors": [
-    "Georg Henkel <georg@develman.de>",
-    "Christoph Huppertz <huppertz.chr@gmail.com>"
+    "Georg Henkel <g.henkel@cgh-solutions.de>",
+    "Christoph Huppertz <c.huppertz@cgh-solutions.de>"
   ],
   "repository": {
     "type": "git",

diff --git a/dist/tie.js b/dist/tie.js
@@ -306,7 +306,7 @@
 
             if (type === "time") {
                 groupAddon.html('<i class="fa fa-clock-o"></i>');
-            } else if (type === "calendar") {
+            } else if (type === "date") {
                 groupAddon.html('<i class="fa fa-calendar"></i>');
             } else {
                 groupAddon.html("<i></i>");
@@ -345,7 +345,7 @@
                 input += " data-regex='" + data.regex + "'";
             }
 
-            if(data.elemdata){
+            if (data.elemdata) {
                 input += " data-elemdata='" + JSON.stringify(data.elemdata) + "'";
             }
 
@@ -422,6 +422,11 @@
             label.addClass("control-label");
 
             var input = "<input type='radio' name='" + data.name + "'";
+
+            if (data.value) {
+                input += " value='" + data.value + "'";
+            }
+
             input = _addNeededOptions(input, data);
             input += " />";
 
@@ -452,7 +457,6 @@
                 }
             }
 
-            formGroup.append("<label class='control-label'>" + data.label + ":</label>");
             var select = "<select name='" + data.name + "' class=" + classes;
 
             if (data.css) {
@@ -476,7 +480,11 @@
 
             if (data.options) {
                 $.each(data.options, function (idx, option) {
-                    select += "<option value='" + option.id + "' data-type='" + option.type + "'>" + option.name + "</option>";
+                    select += "<option value='" + option.id + "'";
+                    if (option.type) {
+                        select += " data-type='" + option.type + "'";
+                    }
+                    select += ">" + option.name + "</option>";
                 });
             }
 
@@ -508,10 +516,8 @@
 
             formGroup = _addLabel(formGroup, data);
 
-            formGroup.append("<label class='control-label'>" + data.label + ":</label>");
             var textarea = "<textarea name='" + data.name + "' class='form-control'";
-
-            textarea = _addNeededOptions(input, data);
+            textarea = _addNeededOptions(textarea, data);
 
             textarea += "></textarea>";
             formGroup.append(textarea);
@@ -526,7 +532,6 @@
             formGroup = _addLabel(formGroup, data);
 
             var textarea = "<div name='" + data.name + "' class='form-control wysiwyg'";
-
             textarea = _addNeededOptions(textarea, data);
 
             textarea += "></div>";
@@ -621,7 +626,12 @@
                     if (!$(field).hasClass("tags")) {
                         var optionArray = field.find("option");
                         optionArray.each(function (idx) {
-                            if ($(optionArray[idx]).attr("data-type") === bindingSource[property]) {
+                            var dataType = $(optionArray[idx]).attr("data-type");
+                            if (dataType) {
+                                if (dataType === bindingSource[property]) {
+                                    field.val($(optionArray[idx]).val());
+                                }
+                            } else if ($(optionArray[idx]).val() === bindingSource[property]) {
                                 field.val($(optionArray[idx]).val());
                             }
                         });