Bugfix: block elements attributes missing (#159)

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

Hide file tree

Showing 17 changed files with 23 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- v1.9.3 - Bugfix: Block elements missing classNames [#159](https://github.com/kevinchappell/formBuilder/pull/159)
 - v1.9.28 - Bugfix: Remove polyfills causing problems in some apps [#151](https://github.com/kevinchappell/formBuilder/pull/151)
 - v1.9.27 - Bugfix: Header subtypes [#136](https://github.com/kevinchappell/formBuilder/pull/136)
 - v1.9.26 - Bugfix: saved subtypes not rendering [#134](https://github.com/kevinchappell/formBuilder/pull/134)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-formBuilder v1.9.28
+formBuilder v1.9.3
 ===========
 
 [![Join the chat at https://gitter.im/kevinchappell/formBuilder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kevinchappell/formBuilder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "formBuilder",
-	"version": "1.9.28",
+	"version": "1.9.3",
 	"main": [
 		"dist/*"
 	],

diff --git a/demo/assets/css/form-builder.css b/demo/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/demo/assets/js/form-builder.js b/demo/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/demo/assets/js/form-builder.min.js b/demo/assets/js/form-builder.min.js
diff --git a/demo/assets/js/form-render.js b/demo/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/demo/assets/js/form-render.min.js b/demo/assets/js/form-render.min.js
diff --git a/demo/assets/js/form-render.min.js.map b/demo/assets/js/form-render.min.js.map
diff --git a/dist/form-builder.css b/dist/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/dist/form-builder.js b/dist/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/dist/form-builder.min.js b/dist/form-builder.min.js
diff --git a/dist/form-render.js b/dist/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') {