Refactor to remove limit on roles (#175)

* Refactor to remove limit on roles * bump
kevinchappell · Jun 22, 2016 · 0aedc76 · 0aedc76
1 parent 7ff1a64
commit 0aedc76
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/assets/css/form-builder.css b/assets/css/form-builder.css
@@ -1,6 +1,6 @@
 /*
 formBuilder - http://kevinchappell.github.io/formBuilder/
-Version: 1.10.1
+Version: 1.10.2
 Author: Kevin Chappell <[email protected]>
 */
 @charset "UTF-8";

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

diff --git a/assets/css/form-render.min.css b/assets/css/form-render.min.css
diff --git a/assets/css/site.min.css b/assets/css/site.min.css
diff --git a/assets/js/form-builder.js b/assets/js/form-builder.js
@@ -1,6 +1,6 @@
 /*
 formBuilder - http://kevinchappell.github.io/formBuilder/
-Version: 1.10.1
+Version: 1.10.2
 Author: Kevin Chappell <[email protected]>
 */
 'use strict';
@@ -1823,6 +1823,7 @@ function formBuilderEventsFn() {
     var advFields = function advFields(values) {
       var advFields = [],
           key,
+          checked = '',
           roles = values.role !== undefined ? values.role.split(',') : [];
 
       // var fieldLabelLabel = _helpers.markup('label', opts.messages.label);
@@ -1861,10 +1862,12 @@ function formBuilderEventsFn() {
       advFields.push('<div class="available-roles" ' + (values.role !== undefined ? 'style="display:block"' : '') + '>');
 
       for (key in opts.roles) {
-        if ($.inArray(key, ['date', '4']) === -1) {
-          advFields.push('<input type="checkbox" name="roles[]" value="' + key + '" id="fld-' + lastID + '-roles-' + key + '" ' + ($.inArray(key, roles) !== -1 ? 'checked' : '') + ' class="roles-field" /><label for="fld-' + lastID + '-roles-' + key + '">' + opts.roles[key] + '</label><br/>');
+        if (opts.roles.hasOwnProperty(key)) {
+          checked = _helpers.inArray(key, roles) ? 'checked' : '';
+          advFields.push('<input type="checkbox" name="roles[]" value="' + key + '" id="fld-' + lastID + '-roles-' + key + '" ' + checked + ' class="roles-field" /><label for="fld-' + lastID + '-roles-' + key + '">' + opts.roles[key] + '</label><br/>');
         }
       }
+
       advFields.push('</div></div>');
 
       if (values.type === 'checkbox-group' || values.type === 'radio-group') {

diff --git a/assets/js/form-builder.min.js b/assets/js/form-builder.min.js
diff --git a/assets/js/form-render.js b/assets/js/form-render.js
@@ -1,6 +1,6 @@
 /*
 formBuilder - http://kevinchappell.github.io/formBuilder/
-Version: 1.10.1
+Version: 1.10.2
 Author: Kevin Chappell <[email protected]>
 */
 'use strict';