Merge branch 'b12consulting-master-upstream'

mchapman · mchapman · commit 290478556d61 · 2015-09-14T18:19:37.000+01:00
diff --git a/README.md b/README.md
@@ -10,3 +10,21 @@ See the documentation at http://www.forms-angular.org
 
 
 
+## Installation of forms-angular
+Recommended: use yeoman generator.
+ 
+Alternative: you can install both front-end and back-end modules:
+````
+npm install --save forms-angular
+bower install --save forms-angular
+````
+
+## For developers of forms-angular
+````
+npm install -g tsd
+tsd update -so
+````
+Prepare a new release:
+````
+gulp all
+````
diff --git a/dist/forms-angular.js b/dist/forms-angular.js
@@ -544,6 +544,7 @@ var fng;
                                     common += 'class="fng-select2' + allInputsVars.formControl + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '"';
                                     common += (fieldInfo.readonly ? ' readonly' : '');
                                     common += (fieldInfo.required ? ' ng-required="true"' : '');
+                                    common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';
                                     if (fieldInfo.select2.fngAjax) {
                                         if (cssFrameworkService.framework() === 'bs2') {
                                             value = '<div class="input-append">';
@@ -565,6 +566,7 @@ var fng;
                                 }
                                 else {
                                     common += (fieldInfo.readonly ? 'disabled ' : '');
+                                    common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';
                                     value = '<select ' + common + 'class="' + allInputsVars.formControl.trim() + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '" ' + requiredStr + '>';
                                     if (!isRequired) {
                                         value += '<option></option>';
@@ -1972,7 +1974,7 @@ var fng;
                         }
                     }
                 }
-                else if (mongooseType.instance === 'boolean') {
+                else if (mongooseType.instance.toLowerCase() === 'boolean') {
                     formInstructions.type = 'checkbox';
                 }
                 else if (mongooseType.instance === 'Number') {
diff --git a/dist/forms-angular.min.js b/dist/forms-angular.min.js
diff --git a/dist/forms-angular.min.js.map b/dist/forms-angular.min.js.map
diff --git a/js/directives/form.ts b/js/directives/form.ts
@@ -94,6 +94,7 @@ module fng.directives {
                 common += 'class="fng-select2' + allInputsVars.formControl + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '"';
                 common += (fieldInfo.readonly ? ' readonly' : '');
                 common += (fieldInfo.required ? ' ng-required="true"' : '');
+                common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';
                 if (fieldInfo.select2.fngAjax) {
                   if (cssFrameworkService.framework() === 'bs2') {
                     value = '<div class="input-append">';
@@ -112,6 +113,7 @@ module fng.directives {
                 }
               } else {
                 common += (fieldInfo.readonly ? 'disabled ' : '');
+                common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';
                 value = '<select ' + common + 'class="' + allInputsVars.formControl.trim() + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '" ' + requiredStr + '>';
                 if (!isRequired) {
                   value += '<option></option>';
diff --git a/js/services/form-generator.ts b/js/services/form-generator.ts
@@ -344,7 +344,7 @@ module fng.services {
             formInstructions.add = 'ui-date ui-date-format datepicker-popup-fix ';
           }
         }
-      } else if (mongooseType.instance === 'boolean') {
+      } else if (mongooseType.instance.toLowerCase() === 'boolean') {
         formInstructions.type = 'checkbox';
       } else if (mongooseType.instance === 'Number') {
         formInstructions.type = 'number';

Original file line number	Diff line number	Diff line change
`@@ -544,6 +544,7 @@ var fng;`
`544`	`544`	`common += 'class="fng-select2' + allInputsVars.formControl + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '"';`
`545`	`545`	`common += (fieldInfo.readonly ? ' readonly' : '');`
`546`	`546`	`common += (fieldInfo.required ? ' ng-required="true"' : '');`
	`547`	`+ common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';`
`547`	`548`	`if (fieldInfo.select2.fngAjax) {`
`548`	`549`	`if (cssFrameworkService.framework() === 'bs2') {`
`549`	`550`	`value = '<div class="input-append">';`
`@@ -565,6 +566,7 @@ var fng;`
`565`	`566`	`}`
`566`	`567`	`else {`
`567`	`568`	`common += (fieldInfo.readonly ? 'disabled ' : '');`
	`569`	`+ common += fieldInfo.add ? (' ' + fieldInfo.add + ' ') : '';`
`568`	`570`	`value = '<select ' + common + 'class="' + allInputsVars.formControl.trim() + allInputsVars.compactClass + allInputsVars.sizeClassBS2 + '" ' + requiredStr + '>';`
`569`	`571`	`if (!isRequired) {`
`570`	`572`	`value += '<option></option>';`
`@@ -1972,7 +1974,7 @@ var fng;`
`1972`	`1974`	`}`
`1973`	`1975`	`}`
`1974`	`1976`	`}`
`1975`		`- else if (mongooseType.instance === 'boolean') {`
	`1977`	`+ else if (mongooseType.instance.toLowerCase() === 'boolean') {`
`1976`	`1978`	`formInstructions.type = 'checkbox';`
`1977`	`1979`	`}`
`1978`	`1980`	`else if (mongooseType.instance === 'Number') {`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ module fng.services {`
`344`	`344`	`formInstructions.add = 'ui-date ui-date-format datepicker-popup-fix ';`
`345`	`345`	`}`
`346`	`346`	`}`
`347`		`- } else if (mongooseType.instance === 'boolean') {`
	`347`	`+ } else if (mongooseType.instance.toLowerCase() === 'boolean') {`
`348`	`348`	`formInstructions.type = 'checkbox';`
`349`	`349`	`} else if (mongooseType.instance === 'Number') {`
`350`	`350`	`formInstructions.type = 'number';`