From 1fed7c61fa0fa5bde54707de5c1663fedba2b333 Mon Sep 17 00:00:00 2001 From: Niko Kovacic Date: Fri, 8 Jan 2016 14:19:13 +0100 Subject: [PATCH 1/4] Angular Formly IFormlyConfig added missing properties. --- angular-formly/angular-formly-tests.ts | 9 +++++++++ angular-formly/angular-formly.d.ts | 16 +++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/angular-formly/angular-formly-tests.ts b/angular-formly/angular-formly-tests.ts index 2374fde4a..0ec57ed44 100644 --- a/angular-formly/angular-formly-tests.ts +++ b/angular-formly/angular-formly-tests.ts @@ -20,6 +20,15 @@ class FormConfig { name: 'customInput', extends: 'input' }); + + formlyConfig.disableWarnings = true; + formlyConfig.templateManipulators = undefined; + + formlyConfig.extras.apiCheckInstance = null; + formlyConfig.extras.defaultHideDirective = 'ng-if'; + formlyConfig.extras.disableNgModelAttrsManipulator = true; + formlyConfig.extras.errorExistsAndShouldBeVisibleExpression = angular.noop; + formlyConfig.extras.explicitAsync = true; } } diff --git a/angular-formly/angular-formly.d.ts b/angular-formly/angular-formly.d.ts index 7ee3d3194..b5688ed7a 100644 --- a/angular-formly/angular-formly.d.ts +++ b/angular-formly/angular-formly.d.ts @@ -558,10 +558,24 @@ declare module AngularFormly { validateOptions?: Function; } + interface IFormlyConfigExtras { + disableNgModelAttrsManipulator: boolean; + apiCheckInstance: any; + ngModelAttrsManipulatorPreferUnbound: boolean; + removeChromeAutoComplete: boolean; + defaultHideDirective: string; + errorExistsAndShouldBeVisibleExpression: any; + getFieldId: Function; + fieldTransform: Function; + explicitAsync: boolean; + } + interface IFormlyConfig { + disableWarnings: boolean; + extras: IFormlyConfigExtras; setType(typeOptions: ITypeOptions): void; setWrapper(wrapperOptions: IWrapperOptions): void; - + templateManipulators: ITemplateManipulators; } interface ITemplateScopeOptions { From 89ccc5f3cd92a48129121eab7809e0a84eb9be18 Mon Sep 17 00:00:00 2001 From: Niko Kovacic Date: Fri, 8 Jan 2016 14:30:32 +0100 Subject: [PATCH 2/4] Added additional tests for extra property --- angular-formly/angular-formly-tests.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/angular-formly/angular-formly-tests.ts b/angular-formly/angular-formly-tests.ts index 0ec57ed44..01449aa4b 100644 --- a/angular-formly/angular-formly-tests.ts +++ b/angular-formly/angular-formly-tests.ts @@ -29,6 +29,9 @@ class FormConfig { formlyConfig.extras.disableNgModelAttrsManipulator = true; formlyConfig.extras.errorExistsAndShouldBeVisibleExpression = angular.noop; formlyConfig.extras.explicitAsync = true; + formlyConfig.extras.fieldTransform = angular.noop; + formlyConfig.extras.getFieldId = angular.noop; + formlyConfig.extras.ngModelAttrsManipulatorPreferUnbound = true; } } From e19066cf24f05ffee4a8add300bb9b9c188323f6 Mon Sep 17 00:00:00 2001 From: Niko Kovacic Date: Fri, 8 Jan 2016 15:25:42 +0100 Subject: [PATCH 3/4] Small lint fixes. --- angular-formly/angular-formly.d.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/angular-formly/angular-formly.d.ts b/angular-formly/angular-formly.d.ts index b5688ed7a..8c07ea800 100644 --- a/angular-formly/angular-formly.d.ts +++ b/angular-formly/angular-formly.d.ts @@ -16,8 +16,8 @@ declare module 'angular-formly' { declare module AngularFormly { - interface IFieldArray extends Array { - + interface IFieldArray extends Array { + } interface IFieldGroup { @@ -160,7 +160,7 @@ declare module AngularFormly { */ asyncValidators?: { [key: string]: string | IExpressionFunction | IValidator; - } + }; /** * This is a great way to add custom behavior to a specific field. It is injectable with the $scope of the @@ -210,7 +210,7 @@ declare module AngularFormly { */ expressionProperties?: { [key: string]: string | IExpressionFunction | IValidator; - } + }; /** @@ -219,7 +219,7 @@ declare module AngularFormly { * * see http://docs.angular-formly.com/docs/field-configuration-object#hide-boolean */ - hide?: boolean + hide?: boolean; /** @@ -432,7 +432,7 @@ declare module AngularFormly { */ show?: boolean; - } + }; /** @@ -446,7 +446,7 @@ declare module AngularFormly { */ validators?: { [key: string]: string | IExpressionFunction | IValidator; - } + }; /** From 99a4e27e9b376ad0636a5b8430076ce460f55ba3 Mon Sep 17 00:00:00 2001 From: Niko Kovacic Date: Mon, 11 Jan 2016 13:27:33 +0100 Subject: [PATCH 4/4] FieldGroup property in IFieldGroup should be optional. --- angular-formly/angular-formly.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular-formly/angular-formly.d.ts b/angular-formly/angular-formly.d.ts index 8c07ea800..f42b35a89 100644 --- a/angular-formly/angular-formly.d.ts +++ b/angular-formly/angular-formly.d.ts @@ -24,7 +24,7 @@ declare module AngularFormly { data?: Object; className?: string; elementAttributes?: string; - fieldGroup: IFieldArray; + fieldGroup?: IFieldArray; form?: Object; hide?: boolean; hideExpression?: string | IExpressionFunction;