Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hidden field breaks formRender #100

Merged
merged 1 commit into from
Mar 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog

- v1.9.11 - Bugfix: formRender hidden field issue [#100](https://github.com/kevinchappell/formBuilder/pull/100)
- v1.9.10 - Bugfix: formRender not rendering with containers [#98](https://github.com/kevinchappell/formBuilder/pull/98)
- v1.9.9 - Bugfix: formRender reinit, take regular js object [#97](https://github.com/kevinchappell/formBuilder/pull/97)
- v1.9.8 - Bugfix: Enter toggles XML field [#95](https://github.com/kevinchappell/formBuilder/pull/95)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
formBuilder v1.9.10
formBuilder v1.9.11
===========

[![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)
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "formBuilder",
"version": "1.9.10",
"version": "1.9.11",
"main": [
"dist/*"
],
Expand Down
2 changes: 1 addition & 1 deletion demo/assets/css/demo.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demo/assets/css/form-builder.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.9.10
Version: 1.9.11
Author: Kevin Chappell <[email protected]>
*/
@charset "UTF-8";
Expand Down
2 changes: 1 addition & 1 deletion demo/assets/css/form-builder.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/assets/css/form-render.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.9.10
Version: 1.9.11
Author: Kevin Chappell <[email protected]>
*/
* {
Expand Down
2 changes: 1 addition & 1 deletion demo/assets/css/form-render.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demo/assets/js/form-builder.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.9.10
Version: 1.9.11
Author: Kevin Chappell <[email protected]>
*/
'use strict';
Expand Down
2 changes: 1 addition & 1 deletion demo/assets/js/form-builder.min.js

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion demo/assets/js/form-render.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
formBuilder - http://kevinchappell.github.io/formBuilder/
Version: 1.9.10
Version: 1.9.11
Author: Kevin Chappell <[email protected]>
*/
'use strict';
Expand Down Expand Up @@ -279,11 +279,28 @@ var FormRender = function FormRender(options, element) {
fieldMarkup = _helpers.markup('div', fieldMarkup, {
className: 'form-group field-' + fieldAttrs.id
});
} else {
fieldMarkup = _helpers.markup('input', null, fieldAttrs);
}

return fieldMarkup;
};

/**
* Convert camelCase into lowercase-hyphen
*
* @param {string} str
* @return {string}
*/
_helpers.hyphenCase = function (str) {
str = str.replace(/[^\w\s\-]/gi, '');
str = str.replace(/([A-Z])/g, function ($1) {
return '-' + $1.toLowerCase();
});

return str.replace(/\s/g, '-').replace(/^-+/g, '');
};

_helpers.attrString = function (attrs) {
var attributes = [];

Expand Down
Loading