Skip to content

Commit 257715c

Browse files
committed
Merge pull request DefinitelyTyped#8516 from dsebastien/master
Updated angularjs IComponentOptions (fixes DefinitelyTyped#8515)
2 parents 1e6eed5 + 36f1d8d commit 257715c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

angularjs/angular.d.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,8 +1707,9 @@ declare namespace angular {
17071707
/**
17081708
* Controller constructor function that should be associated with newly created scope or the name of a registered
17091709
* controller if passed as a string. Empty function by default.
1710+
* Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
17101711
*/
1711-
controller?: string | Function;
1712+
controller?: string | Function | (string | Function)[];
17121713
/**
17131714
* An identifier name for a reference to the controller. If present, the controller will be published to scope under
17141715
* the controllerAs name. If not present, this will default to be the same as the component name.
@@ -1721,15 +1722,17 @@ declare namespace angular {
17211722
* If template is a function, then it is injected with the following locals:
17221723
* $element - Current element
17231724
* $attrs - Current attributes object for the element
1725+
* Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
17241726
*/
1725-
template?: string | Function;
1727+
template?: string | Function | (string | Function)[];
17261728
/**
17271729
* path or function that returns a path to an html template that should be used as the contents of this component.
17281730
* If templateUrl is a function, then it is injected with the following locals:
17291731
* $element - Current element
17301732
* $attrs - Current attributes object for the element
1733+
* Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection)
17311734
*/
1732-
templateUrl?: string | Function;
1735+
templateUrl?: string | Function | (string | Function)[];
17331736
/**
17341737
* Define DOM attribute binding to component properties. Component properties are always bound to the component
17351738
* controller and not to the scope.

0 commit comments

Comments
 (0)