Merge pull request kevinchappell#134 from kevinchappell/hotfix/subtypes

Bugfix: subtypes not rendering
steedos · Apr 10, 2016 · 9b35c5b · 9b35c5b
2 parents 03a49d2 + b1c0e86
commit 9b35c5b
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- v1.9.26 - Bugfix: saved subtypes not rendering [#134](https://github.com/kevinchappell/formBuilder/pull/134)
 - v1.9.25 - Bugfix: Standardizes how field variables are processed from xml, defaultfields and new field sources [#129](https://github.com/kevinchappell/formBuilder/pull/129)
 - v1.9.24 - Bugfix: Update internal field id to better handle multiple editors [#126](https://github.com/kevinchappell/formBuilder/pull/126)
 - v1.9.23 - Bugfix: editing class attribute is wonky [#122](https://github.com/kevinchappell/formBuilder/pull/122)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-formBuilder v1.9.25
+formBuilder v1.9.26
 ===========
 
 [![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.25",
+	"version": "1.9.26",
 	"main": [
 		"dist/*"
 	],

diff --git a/demo/assets/css/form-builder.css b/demo/assets/css/form-builder.css
@@ -1,6 +1,6 @@
 /*
 formBuilder - http://kevinchappell.github.io/formBuilder/
-Version: 1.9.25
+Version: 1.9.26
 Author: Kevin Chappell <[email protected]>
 */
 @charset "UTF-8";

diff --git a/demo/assets/css/form-builder.min.css b/demo/assets/css/form-builder.min.css
diff --git a/demo/assets/css/form-render.css b/demo/assets/css/form-render.css
@@ -1,6 +1,6 @@
 /*
 formBuilder - http://kevinchappell.github.io/formBuilder/
-Version: 1.9.25
+Version: 1.9.26
 Author: Kevin Chappell <[email protected]>
 */
 * {

diff --git a/demo/assets/css/form-render.min.css b/demo/assets/css/form-render.min.css
diff --git a/demo/assets/css/site.min.css b/demo/assets/css/site.min.css
diff --git a/demo/assets/js/form-builder.js b/demo/assets/js/form-builder.js
@@ -1,6 +1,6 @@
 /*
 formBuilder - http://kevinchappell.github.io/formBuilder/
-Version: 1.9.25
+Version: 1.9.26
 Author: Kevin Chappell <[email protected]>
 */
 'use strict';
@@ -1784,7 +1784,7 @@ function formBuilderEventsFn() {
 
       advFields.push(fieldDescription(values));
 
-      advFields.push(subTypeField(values.type));
+      advFields.push(subTypeField(values));
 
       advFields.push(btnStyles(values.style, values.type));
 
@@ -1851,11 +1851,13 @@ function formBuilderEventsFn() {
 
     /**
      * Changes a fields type
-     * @param  {String} type
+     *
+     * @param  {Object} values
      * @return {String}      markup for type <select> input
      */
-    var subTypeField = function subTypeField(type) {
+    var subTypeField = function subTypeField(values) {
       var subTypes = opts.messages.subtypes,
+          type = values.subtype || values.type,
           subType = '';
 
       if (subTypes[type]) {

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
@@ -1,6 +1,6 @@
 /*
 formBuilder - http://kevinchappell.github.io/formBuilder/
-Version: 1.9.25
+Version: 1.9.26
 Author: Kevin Chappell <[email protected]>
 */
 'use strict';