Add support for noLookup, small bug fix

mchapman · mchapman · commit 01a94f57f7a8 · 2017-11-13T18:10:04.000Z
diff --git a/dist/forms-angular.js b/dist/forms-angular.js
@@ -1015,7 +1015,9 @@ var fng;
                                                     }
                                                     break;
                                                 default:
-                                                    newElement += ' fng-fld-' + prop + '="' + info[prop].toString().replace(/"/g, '&quot;') + '"';
+                                                    if (info[prop]) {
+                                                        newElement += ' fng-fld-' + prop + '="' + info[prop].toString().replace(/"/g, '&quot;') + '"';
+                                                    }
                                                     break;
                                             }
                                         }
@@ -1885,7 +1887,7 @@ var fng;
                         if (formInstructions.select2 || (mongooseOptions.form && mongooseOptions.form.select2)) {
                             console.log('support for fng-select2 has been removed in 0.8.3 - please convert to fng-ui-select');
                         }
-                        else if (!formInstructions.directive || !formInstructions[$filter('camelCase')(formInstructions.directive)] || !formInstructions[$filter('camelCase')(formInstructions.directive)].fngAjax) {
+                        else if (!formInstructions.directive || (!formInstructions.noLookup && (!formInstructions[$filter('camelCase')(formInstructions.directive)] || !formInstructions[$filter('camelCase')(formInstructions.directive)].fngAjax))) {
                             performLookupSelect();
                         }
                     }
@@ -2992,6 +2994,9 @@ var fng;
                                 console.log('Error parsing specified record : ' + e.message);
                             }
                         }
+                        if (typeof $scope.dataEventFunctions.onInitialiseNewRecord === 'function') {
+                            $scope.dataEventFunctions.onInitialiseNewRecord(ctrlState.master);
+                        }
                         $scope.phase = 'ready';
                         $scope.cancel();
                     }
diff --git a/dist/forms-angular.min.js b/dist/forms-angular.min.js
diff --git a/js/directives/form.ts b/js/directives/form.ts
@@ -500,7 +500,9 @@ module fng.directives {
                         }
                         break;
                       default:
-                        newElement += ' fng-fld-' + prop + '="' + info[prop].toString().replace(/"/g, '&quot;') + '"';
+                        if (info[prop]) {
+                          newElement += ' fng-fld-' + prop + '="' + info[prop].toString().replace(/"/g, '&quot;') + '"';
+                        }
                         break;
                     }
                   }
diff --git a/js/services/form-generator.ts b/js/services/form-generator.ts
@@ -161,7 +161,7 @@ module fng.services {
           formInstructions.type = 'select';
             if (formInstructions.select2 || (mongooseOptions.form && mongooseOptions.form.select2)) {
               console.log('support for fng-select2 has been removed in 0.8.3 - please convert to fng-ui-select');
-            } else if (!formInstructions.directive || !formInstructions[$filter('camelCase')(formInstructions.directive)] || !formInstructions[$filter('camelCase')(formInstructions.directive)].fngAjax) {
+            } else if (!formInstructions.directive || (!formInstructions.noLookup && (!formInstructions[$filter('camelCase')(formInstructions.directive)] || !formInstructions[$filter('camelCase')(formInstructions.directive)].fngAjax))) {
               performLookupSelect();
             }
         }
diff --git a/js/services/record-handler.ts b/js/services/record-handler.ts
@@ -388,6 +388,9 @@ module fng.services {
               console.log('Error parsing specified record : ' + e.message);
             }
           }
+          if (typeof $scope.dataEventFunctions.onInitialiseNewRecord === 'function') {
+            $scope.dataEventFunctions.onInitialiseNewRecord(ctrlState.master);
+          }
           $scope.phase = 'ready';
           $scope.cancel();
         }

Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,9 @@ var fng;`
`1015`	`1015`	`}`
`1016`	`1016`	`break;`
`1017`	`1017`	`default:`
`1018`		`- newElement += ' fng-fld-' + prop + '="' + info[prop].toString().replace(/"/g, '"') + '"';`
	`1018`	`+ if (info[prop]) {`
	`1019`	`+ newElement += ' fng-fld-' + prop + '="' + info[prop].toString().replace(/"/g, '"') + '"';`
	`1020`	`+ }`
`1019`	`1021`	`break;`
`1020`	`1022`	`}`
`1021`	`1023`	`}`
`@@ -1885,7 +1887,7 @@ var fng;`
`1885`	`1887`	`if (formInstructions.select2 \|\| (mongooseOptions.form && mongooseOptions.form.select2)) {`
`1886`	`1888`	`console.log('support for fng-select2 has been removed in 0.8.3 - please convert to fng-ui-select');`
`1887`	`1889`	`}`
`1888`		`- else if (!formInstructions.directive \|\| !formInstructions[$filter('camelCase')(formInstructions.directive)] \|\| !formInstructions[$filter('camelCase')(formInstructions.directive)].fngAjax) {`
	`1890`	`+ else if (!formInstructions.directive \|\| (!formInstructions.noLookup && (!formInstructions[$filter('camelCase')(formInstructions.directive)] \|\| !formInstructions[$filter('camelCase')(formInstructions.directive)].fngAjax))) {`
`1889`	`1891`	`performLookupSelect();`
`1890`	`1892`	`}`
`1891`	`1893`	`}`
`@@ -2992,6 +2994,9 @@ var fng;`
`2992`	`2994`	`console.log('Error parsing specified record : ' + e.message);`
`2993`	`2995`	`}`
`2994`	`2996`	`}`
	`2997`	`+ if (typeof $scope.dataEventFunctions.onInitialiseNewRecord === 'function') {`
	`2998`	`+ $scope.dataEventFunctions.onInitialiseNewRecord(ctrlState.master);`
	`2999`	`+ }`
`2995`	`3000`	`$scope.phase = 'ready';`
`2996`	`3001`	`$scope.cancel();`
`2997`	`3002`	`}`
Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,9 @@ module fng.directives {`
`500`	`500`	`}`
`501`	`501`	`break;`
`502`	`502`	`default:`
`503`		`- newElement += ' fng-fld-' + prop + '="' + info[prop].toString().replace(/"/g, '"') + '"';`
	`503`	`+ if (info[prop]) {`
	`504`	`+ newElement += ' fng-fld-' + prop + '="' + info[prop].toString().replace(/"/g, '"') + '"';`
	`505`	`+ }`
`504`	`506`	`break;`
`505`	`507`	`}`
`506`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ module fng.services {`
`161`	`161`	`formInstructions.type = 'select';`
`162`	`162`	`if (formInstructions.select2 \|\| (mongooseOptions.form && mongooseOptions.form.select2)) {`
`163`	`163`	`console.log('support for fng-select2 has been removed in 0.8.3 - please convert to fng-ui-select');`
`164`		`- } else if (!formInstructions.directive \|\| !formInstructions[$filter('camelCase')(formInstructions.directive)] \|\| !formInstructions[$filter('camelCase')(formInstructions.directive)].fngAjax) {`
	`164`	`+ } else if (!formInstructions.directive \|\| (!formInstructions.noLookup && (!formInstructions[$filter('camelCase')(formInstructions.directive)] \|\| !formInstructions[$filter('camelCase')(formInstructions.directive)].fngAjax))) {`
`165`	`165`	`performLookupSelect();`
`166`	`166`	`}`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,9 @@ module fng.services {`
`388`	`388`	`console.log('Error parsing specified record : ' + e.message);`
`389`	`389`	`}`
`390`	`390`	`}`
	`391`	`+ if (typeof $scope.dataEventFunctions.onInitialiseNewRecord === 'function') {`
	`392`	`+ $scope.dataEventFunctions.onInitialiseNewRecord(ctrlState.master);`
	`393`	`+ }`
`391`	`394`	`$scope.phase = 'ready';`
`392`	`395`	`$scope.cancel();`
`393`	`396`	`}`