Bugfix: block elements attributes missing (#159)

* Bugfix: block elements attributes missing, Resolves #158 * version bump
kevinchappell · Jun 2, 2016 · 9ac98f7 · 9ac98f7
1 parent 426bbcb
commit 9ac98f7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/assets/css/form-builder.css b/assets/css/form-builder.css
@@ -907,8 +907,7 @@ ol.sortable-options {
   width: 100%;
   height: 100%; }
 
-.kc-toggle
-.kct-on {
+.kc-toggle .kct-on {
   color: #12a912; }
 
 .kct-off {

diff --git a/assets/js/form-builder.js b/assets/js/form-builder.js
@@ -587,7 +587,7 @@ function formBuilderHelpersFn(opts, formBuilder) {
     var i,
         preview = '',
         epoch = new Date().getTime();
-    attrs = Object.assign({}, attrs);
+    attrs = jQuery.extend({}, attrs);
     attrs.type = attrs.subtype || attrs.type;
     var toggle = attrs.toggle ? 'toggle' : '';
     // attrs = _helpers.escapeAttrs(attrs);
@@ -644,7 +644,8 @@ function formBuilderHelpersFn(opts, formBuilder) {
         preview = '<input class="ui-autocomplete-input ' + attrs.className + '" autocomplete="on">';
         break;
       default:
-        preview = '<' + attrs.type + '>' + attrs.label + '</' + attrs.type + '>';
+        attrsString = _helpers.attrString(attrs);
+        preview = '<' + attrs.type + ' ' + attrsString + '>' + attrs.label + '</' + attrs.type + '>';
     }
 
     return preview;

diff --git a/assets/js/form-builder.min.js b/assets/js/form-builder.min.js
diff --git a/assets/js/form-render.js b/assets/js/form-render.js
@@ -273,7 +273,7 @@ function FormRenderFn(options, element) {
         }
         break;
       default:
-        fieldMarkup = '<' + fieldAttrs.type + '>' + fieldLabelText + '</' + fieldAttrs.type + '>';
+        fieldMarkup = '<' + fieldAttrs.type + ' ' + fieldAttrsString + '>' + fieldLabelVal + '</' + fieldAttrs.type + '>';
     }
 
     if (fieldAttrs.type !== 'hidden') {

diff --git a/assets/js/form-render.min.js b/assets/js/form-render.min.js
diff --git a/assets/js/form-render.min.js.map b/assets/js/form-render.min.js.map