Merge pull request kevinchappell#42 from kevinchappell/hotfix/deep-co…

…py-options Deep copy user options
ghostfreak3000 · Jan 27, 2016 · d47e089 · d47e089
2 parents 6235bd8 + a7c7bc1
commit d47e089
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- v1.6.4 - Bugfix: User options should be deep copied with `$.extend`
 - v1.6.3 - Bugfix: Remove `max-length` attribute for hidden fields, Update preview and label for `textarea`
 - v1.6.2 - Bugfix: Option text not rendered in IE #39
 - v1.6.1 - Bugfix: required attribute should not be rendered when false.

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

diff --git a/demo/assets/demo.css b/demo/assets/demo.css
diff --git a/demo/assets/form-builder.min.css b/demo/assets/form-builder.min.css
diff --git a/demo/assets/form-builder.min.js b/demo/assets/form-builder.min.js
diff --git a/demo/assets/form-render.min.css b/demo/assets/form-render.min.css
diff --git a/demo/assets/form-render.min.js b/demo/assets/form-render.min.js
diff --git a/dist/form-builder.css b/dist/form-builder.css
@@ -1,6 +1,6 @@
 /*
 formBuilder - [email protected]:kevinchappell/formBuilder.git
-Version: 1.6.3
+Version: 1.6.4
 Author: Kevin Chappell <[email protected]>
 */
 * {

diff --git a/dist/form-builder.js b/dist/form-builder.js
@@ -1,6 +1,6 @@
 /*
 formBuilder - [email protected]:kevinchappell/formBuilder.git
-Version: 1.6.3
+Version: 1.6.4
 Author: Kevin Chappell <[email protected]>
 */
 'use strict';
@@ -332,7 +332,7 @@ Author: Kevin Chappell <[email protected]>
       }
     };
 
-    var opts = $.extend(defaults, options),
+    var opts = $.extend(true, defaults, options),
         elem = $(element),
         frmbID = 'frmb-' + $('ul[id^=frmb-]').length++;
 

diff --git a/dist/form-builder.min.css b/dist/form-builder.min.css
diff --git a/dist/form-builder.min.js b/dist/form-builder.min.js
diff --git a/dist/form-render.css b/dist/form-render.css
@@ -1,6 +1,6 @@
 /*
 formBuilder - [email protected]:kevinchappell/formBuilder.git
-Version: 1.6.3
+Version: 1.6.4
 Author: Kevin Chappell <[email protected]>
 */
 * {

diff --git a/dist/form-render.js b/dist/form-render.js
@@ -1,6 +1,6 @@
 /*
 formBuilder - [email protected]:kevinchappell/formBuilder.git
-Version: 1.6.3
+Version: 1.6.4
 Author: Kevin Chappell <[email protected]>
 */
 'use strict';

diff --git a/dist/form-render.min.css b/dist/form-render.min.css