Merge pull request #72 from kevinchappell/hotfix/maxlength

Close button and maxlength fix
kevinchappell · Feb 24, 2016 · e23f069 · e23f069
2 parents 15d98b0 + 45e5768
commit e23f069
Show file tree

Hide file tree

Showing 25 changed files with 466 additions and 185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+- v1.7.7
+  - Bugfix: Close button doesn't close #71
+  - Bugfix: max-length attribute should be maxlength #70
+  - Chore: Add gulp plumber to build process to catch errors instead of fail build.
 - v1.7.6 - Bugfix: radio and checkbox group options without values cause formRender error.
 - v1.7.5
   - Bugfix: Multiple selection bug for checkbox group and radio group fields. [#66](https://github.com/kevinchappell/formBuilder/pull/66)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-formBuilder v1.7.6
+formBuilder v1.7.7
 ===========
 
 [![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)
@@ -21,9 +21,5 @@ jQuery(document).ready(function($) {
 ## [Demo](http://kevinchappell.github.io/formBuilder/) ##
 [![form-builder](https://cloud.githubusercontent.com/assets/1457540/10989863/89d81010-8444-11e5-9717-d2c618439793.gif)](http://kevinchappell.github.io/formBuilder/)
 
-## Coming in 2.0
-- HTML5 fields and attributes
-- JSON data as default instead of XML
-- More examples
-
 ## [Changelog](https://github.com/kevinchappell/formBuilder/blob/master/CHANGELOG.md) ##
+
diff --git a/demo/assets/css/demo.css b/demo/assets/css/demo.css
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.7.6
+Version: 1.7.7
 Author: Kevin Chappell <kevin.b.chappell@gmail.com>
 */
 * {
@@ -484,7 +484,8 @@ textarea.idea-template {
   display: table;
   clear: both; }
 
-.cb-wrap, .stage-wrap {
+.cb-wrap,
+.stage-wrap {
   vertical-align: top; }
 
 .cb-wrap {
@@ -516,7 +517,9 @@ textarea.idea-template {
   margin-top: 0;
   color: #666; }
 
-.action-links a.clear-all:hover, .del-button:hover, ul.frmb span.required {
+.action-links a.clear-all:hover,
+.del-button:hover,
+ul.frmb span.required {
   color: #C10000; }
 
 .action-links a {
@@ -535,7 +538,8 @@ textarea.idea-template {
   margin: 5px 0 0;
   padding: 10px 5px; }
 
-.form-elements .false-label, .form-elements .fields {
+.form-elements .false-label,
+.form-elements .fields {
   margin-top: 10px; }
 
 .form-elements .fields {
@@ -551,7 +555,8 @@ textarea.idea-template {
   padding: .2em .6em;
   border-radius: 0 3px 3px 0; }
 
-.form-elements .sortable-options li:nth-child(1) .remove, .form-elements .sortable-options li:nth-child(2) .remove {
+.form-elements .sortable-options li:nth-child(1) .remove,
+.form-elements .sortable-options li:nth-child(2) .remove {
   display: none; }
 
 ol.sortable-options {
@@ -564,7 +569,8 @@ ol.sortable-options li {
   clear: both;
   position: relative; }
 
-.form-elements .fields input[type=checkbox], .form-elements .fields input[type=radio] {
+.form-elements .fields input[type=checkbox],
+.form-elements .fields input[type=radio] {
   float: left;
   margin-right: 5px; }
 
@@ -584,14 +590,15 @@ ol.sortable-options li {
   border-radius: 0;
   border: 1px solid #C10000; }
 
-.form-elements input[type=text].fld-max-length {
+.form-elements input[type=text].fld-maxlength {
   width: 10%; }
 
 .form-elements input.field_error {
   background: #fefefe;
   border: 1px solid #afafab; }
 
-.form-elements .false-label, .form-elements label {
+.form-elements .false-label,
+.form-elements label {
   width: 18%;
   float: left;
   margin-left: 5px;
@@ -601,27 +608,26 @@ ol.sortable-options li {
   text-align: right;
   line-height: 32px; }
 
-.form-elements label.multiple,
-.form-elements label.required_label,
-.form-elements label.toggle-label,
-.form-elements label.roles_label {
-  float: none;
+.form-elements label.multiple, .form-elements label.required-label, .form-elements label.toggle-label, .form-elements label.roles-label {
   display: inline;
+  float: none;
   font-weight: 400;
   width: auto; }
 
 .form-elements label em {
   display: block;
   font-weight: 400;
-  font-size: 0.75em; }
+  font-size: .75em; }
 
-.form-elements label.max-length-label {
+.form-elements label.maxlength-label {
   line-height: 1em; }
 
 .form-elements .allow-multi input {
   margin-top: 10px; }
 
-.allow-select .form-elements .allow-multi, .allow-select .form-elements .select-option, .edit-names .form-elements .name-wrap {
+.allow-select .form-elements .allow-multi,
+.allow-select .form-elements .select-option,
+.edit-names .form-elements .name-wrap {
   display: block !important; }
 
 .frm-fld .available-roles {
@@ -642,20 +648,28 @@ ol.sortable-options li {
   display: inline;
   top: auto; }
 
-.form-elements, .frm-fld, .multi-row span, textarea {
+.form-elements,
+.frm-fld,
+.multi-row span,
+textarea {
   display: block; }
 
-.form-elements:after, .frm-fld:after {
+.form-elements:after,
+.frm-fld:after {
   content: ".";
   display: block;
   height: 0;
   clear: both;
   visibility: hidden; }
 
-.form-elements .fields div:hover, .frmb .legend, .frmb .prev-holder, .frmb .prev-holder * {
+.form-elements .fields div:hover,
+.frmb .legend,
+.frmb .prev-holder,
+.frmb .prev-holder * {
   cursor: move; }
 
-.prev-holder input[type=checkbox], .prev-holder input[type=radio] {
+.prev-holder input[type=checkbox],
+.prev-holder input[type=radio] {
   margin-right: 5px; }
 
 .frmb-tt {
@@ -669,7 +683,8 @@ ol.sortable-options li {
   text-align: left;
   font-size: 12px; }
 
-.frmb-tt:after, .frmb-tt:before {
+.frmb-tt:after,
+.frmb-tt:before {
   content: '';
   position: absolute;
   border-style: solid;
@@ -690,13 +705,19 @@ ol.sortable-options li {
   text-decoration: underline;
   color: #fff; }
 
-.frmb li.moving, .frmb li.ui-sortable-helper, .frmb-control li.moving, .frmb-control li.ui-sortable-helper {
+.frmb li.moving,
+.frmb li.ui-sortable-helper,
+.frmb-control li.moving,
+.frmb-control li.ui-sortable-helper {
   -webkit-transition: box-shadow 250ms ease-in-out;
           transition: box-shadow 250ms ease-in-out;
   box-shadow: 2px 2px 6px 0 #666;
   border: 1px solid #fff; }
 
-.frmb li:hover .del-button, .frmb li:hover .toggle-form, .fb-mobile .frmb li .del-button, .fb-mobile .frmb li .toggle-form {
+.frmb li:hover .del-button,
+.frmb li:hover .toggle-form,
+.fb-mobile .frmb li .del-button,
+.fb-mobile .frmb li .toggle-form {
   opacity: 1; }
 
 .fresh .frmb .legend .element-info {
@@ -721,7 +742,8 @@ ol.sortable-options li {
   .frmb-control li.ui-state-highlight {
     background-image: none; }
 
-.frmb-control, table.form ul.frmb-control {
+.frmb-control,
+table.form ul.frmb-control {
   margin: 0;
   padding: 0;
   min-width: 208px; }
@@ -736,7 +758,8 @@ ol.sortable-options li {
   padding: 0 30px;
   margin-top: 0; }
 
-.action-links a.export-xml:hover, .toggle-form.closed:hover {
+.action-links a.export-xml:hover,
+.toggle-form.closed:hover {
   color: #6fc245; }
 
 a.btn.toggle-form {

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.7.6
+Version: 1.7.7
 Author: Kevin Chappell <kevin.b.chappell@gmail.com>
 */
 * {

diff --git a/demo/assets/css/form-render.min.css b/demo/assets/css/form-render.min.css