Skip to content

Commit

Permalink
Bugfix: radio and checkbox group other option (#186)
Browse files Browse the repository at this point in the history
* Bugfix: radio and checkbox group other option

* 1.10.5, update changelog
  • Loading branch information
kevinchappell authored Jul 12, 2016
1 parent 37a822c commit 5c117b5
Show file tree
Hide file tree
Showing 24 changed files with 35 additions and 34 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog

- v1.10.5 - Bugfix: Other option for radio and checkbox xml attribute [#186](https://github.com/kevinchappell/formBuilder/pull/186)
- v1.10.4 - Bugfix: Object.assign [#181](https://github.com/kevinchappell/formBuilder/pull/181)
- v1.10.3 - Bugfix: defaultFields multiple select not applied [#176](https://github.com/kevinchappell/formBuilder/pull/176)
- v1.10.2 - Bugfix: Remove role limit [#175](https://github.com/kevinchappell/formBuilder/pull/175)
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.10.4
formBuilder v1.10.5
===========

[![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.10.4",
"version": "1.10.5",
"main": [
"dist/*"
],
Expand Down
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.10.4
Version: 1.10.5
Author: Kevin Chappell <kevin.b.chappell@gmail.com>
*/
@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.10.4
Version: 1.10.5
Author: Kevin Chappell <kevin.b.chappell@gmail.com>
*/
* {
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/css/site.min.css

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

4 changes: 2 additions & 2 deletions 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.10.4
Version: 1.10.5
Author: Kevin Chappell <kevin.b.chappell@gmail.com>
*/
'use strict';
Expand Down Expand Up @@ -2493,7 +2493,7 @@ function formBuilderEventsFn() {
xmlAttrs.role = roleVals.join(',');
}
if (enableOther) {
xmlAttrs.enableOther = 'true';
xmlAttrs.other = 'true';
}
xmlAttrs = _helpers.trimAttrs(xmlAttrs);
xmlAttrs = _helpers.escapeAttrs(xmlAttrs);
Expand Down
4 changes: 2 additions & 2 deletions demo/assets/js/form-builder.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions 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.10.4
Version: 1.10.5
Author: Kevin Chappell <kevin.b.chappell@gmail.com>
*/
'use strict';
Expand Down Expand Up @@ -226,8 +226,8 @@ function FormRenderFn(options, element) {
var enableOther = false;
fieldAttrs.type = fieldAttrs.type.replace('-group', '');

if (fieldAttrs['enable-other']) {
delete fieldAttrs['enable-other'];
if (fieldAttrs['other']) {
delete fieldAttrs['other'];
enableOther = true;
}

Expand Down
Loading

0 comments on commit 5c117b5

Please sign in to comment.