Skip to content

Commit 03bc8bd

Browse files
committed
Fixed a couple of edge cases when looking for default values.
1 parent 798ad57 commit 03bc8bd

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
"angular-ui-bootstrap": "1.3.2 || 2.5.6",
5151
"angular-ui-grid": "^4.8.1",
5252
"async": "3.1.0",
53-
"fng-reports": "^0.12.0-beta.46",
54-
"fng-ui-select": "^0.12.0-beta.46",
5553
"lodash": "^4.17.15",
5654
"ng-infinite-scroll": "1.3.0",
5755
"node.extend": "2.0.2"

src/client/js/services/form-generator.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,10 @@ module fng.services {
452452
// check that target element is visible. May not be reliable - see https://stackoverflow.com/questions/19669786/check-if-element-is-visible-in-dom
453453
if ($event.target.offsetParent) {
454454
var arrayField = getArrayFieldToExtend(fieldName, $scope);
455-
var obj = $scope.setDefaults($scope.formSchema.find(f => f.name === fieldName).schema, fieldName + '.');
455+
456+
const schemaElement = $scope.formSchema.find(f => f.name === fieldName); // In case someone is using the formSchema directly
457+
const subSchema = schemaElement ? schemaElement.schema : null;
458+
let obj = subSchema ? $scope.setDefaults(subSchema, fieldName + '.') : {};
456459
arrayField.push(obj);
457460
$scope.setFormDirty($event);
458461
}

website/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "website",
33
"author": "Mark Chapman <support@forms-angular.org>",
4-
"version": "0.12.0-beta.45",
4+
"version": "0.12.0-beta.50",
55
"description": "The demonstration website for the forms-angular library",
66
"repository": {
77
"type": "git",
@@ -28,16 +28,16 @@
2828
"compression": "1.7.4",
2929
"errorhandler": "1.5.1",
3030
"express": "4.17.1",
31-
"fng-audit": "0.12.0-beta.45",
32-
"fng-bootstrap-date": "0.12.0-beta.45",
33-
"fng-bootstrap-datetime": "0.12.0-beta.45",
34-
"fng-ckeditor": "0.12.0-beta.45",
35-
"fng-colour-picker": "^0.12.0-beta.45",
36-
"fng-jq-upload": "0.12.0-beta.45",
37-
"fng-reports": "^0.12.0-beta.45",
38-
"fng-ui-date": "0.12.0-beta.45",
39-
"fng-ui-select": "0.12.0-beta.45",
40-
"forms-angular": "^0.12.0-beta.45",
31+
"fng-audit": "0.12.0-beta.50",
32+
"fng-bootstrap-date": "0.12.0-beta.50",
33+
"fng-bootstrap-datetime": "0.12.0-beta.50",
34+
"fng-ckeditor": "0.12.0-beta.50",
35+
"fng-colour-picker": "^0.12.0-beta.50",
36+
"fng-jq-upload": "0.12.0-beta.50",
37+
"fng-reports": "^0.12.0-beta.50",
38+
"fng-ui-date": "0.12.0-beta.50",
39+
"fng-ui-select": "0.12.0-beta.50",
40+
"forms-angular": "^0.12.0-beta.50",
4141
"jspdf-autotable": "^3.2.4",
4242
"lodash": "^4.17.15",
4343
"method-override": "3.0.0",

0 commit comments

Comments
 (0)