mirror of
https://github.com/wassname/DefinitelyTyped.git
synced 2026-09-09 11:13:57 +08:00
angular.IRoute.controller can be defined as array
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
/// <reference path="angular.d.ts" />
|
||||
/// <reference path="angular-route.d.ts" />
|
||||
|
||||
/**
|
||||
@@ -32,6 +33,14 @@ $routeProvider
|
||||
return "I return a string"
|
||||
}
|
||||
})
|
||||
.when('/projects/:projectId/dashboard5', {
|
||||
controller: ['$log',function($log:ng.ILogService){
|
||||
$log.info('I am array')
|
||||
}],
|
||||
templateUrl: function ($routeParams?: ng.route.IRouteParamsService) {
|
||||
return "I return a string"
|
||||
}
|
||||
})
|
||||
.otherwise({ redirectTo: '/' })
|
||||
.otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" });
|
||||
|
||||
|
||||
Vendored
+2
-1
@@ -47,6 +47,7 @@ declare module angular.route {
|
||||
|
||||
}
|
||||
|
||||
type InlineAnnotatedFunction = Function|Array<string|Function>
|
||||
|
||||
/**
|
||||
* see http://docs.angularjs.org/api/ngRoute/provider/$routeProvider#when for API documentation
|
||||
@@ -56,7 +57,7 @@ declare module angular.route {
|
||||
* {(string|function()=}
|
||||
* Controller fn that should be associated with newly created scope or the name of a registered controller if passed as a string.
|
||||
*/
|
||||
controller?: string|Function;
|
||||
controller?: string|InlineAnnotatedFunction;
|
||||
/**
|
||||
* A controller alias name. If present the controller will be published to scope under the controllerAs name.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user