From b2da5285ff11cc5c82b879c3a46cc8169361d35a Mon Sep 17 00:00:00 2001 From: Sebastien Date: Sat, 12 Mar 2016 02:49:58 +0100 Subject: [PATCH 1/2] Updated angularjs IComponentOptions (fixes #8515) --- angularjs/angular.d.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index f655c21c4..c38724b31 100644 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -1698,8 +1698,9 @@ declare module angular { /** * Controller constructor function that should be associated with newly created scope or the name of a registered * controller if passed as a string. Empty function by default. + * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) */ - controller?: string | Function; + controller?: string | Function | any[]; /** * An identifier name for a reference to the controller. If present, the controller will be published to scope under * the controllerAs name. If not present, this will default to be the same as the component name. @@ -1712,15 +1713,17 @@ declare module angular { * If template is a function, then it is injected with the following locals: * $element - Current element * $attrs - Current attributes object for the element + * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) */ - template?: string | Function; + template?: string | Function | any[]; /** * path or function that returns a path to an html template that should be used as the contents of this component. * If templateUrl is a function, then it is injected with the following locals: * $element - Current element * $attrs - Current attributes object for the element + * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) */ - templateUrl?: string | Function; + templateUrl?: string | Function | any[]; /** * Define DOM attribute binding to component properties. Component properties are always bound to the component * controller and not to the scope. From 36f1d8d82f0593d839aad6944260fd19a090aa78 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Fri, 18 Mar 2016 11:21:30 +0100 Subject: [PATCH 2/2] Updated to improve IComponentOptions --- angularjs/angular.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 8f3319398..1d7ad5ee6 100644 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -1709,7 +1709,7 @@ declare namespace angular { * controller if passed as a string. Empty function by default. * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) */ - controller?: string | Function | any[]; + controller?: string | Function | (string | Function)[]; /** * An identifier name for a reference to the controller. If present, the controller will be published to scope under * the controllerAs name. If not present, this will default to be the same as the component name. @@ -1724,7 +1724,7 @@ declare namespace angular { * $attrs - Current attributes object for the element * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) */ - template?: string | Function | any[]; + template?: string | Function | (string | Function)[]; /** * path or function that returns a path to an html template that should be used as the contents of this component. * If templateUrl is a function, then it is injected with the following locals: @@ -1732,7 +1732,7 @@ declare namespace angular { * $attrs - Current attributes object for the element * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) */ - templateUrl?: string | Function | any[]; + templateUrl?: string | Function | (string | Function)[]; /** * Define DOM attribute binding to component properties. Component properties are always bound to the component * controller and not to the scope.