Let the union types go forth and multiply

This commit is contained in:
johnnyreilly
2015-01-17 08:04:09 +00:00
parent 6425747807
commit 9fc7f5794c
2 changed files with 15 additions and 7 deletions

View File

@@ -8,10 +8,18 @@
declare var $routeProvider: ng.route.IRouteProvider;
$routeProvider
.when('/projects/:projectId/dashboard',{
controller: '',
templateUrl: '',
caseInsensitiveMatch: true,
reloadOnSearch: false
})
.when('/projects/:projectId/dashboard', {
controller: 'I am a string',
templateUrl: '',
caseInsensitiveMatch: true,
reloadOnSearch: false
})
.when('/projects/:projectId/dashboard', {
controller: function() {
//Look at me - I'm a function!
},
templateUrl: '',
caseInsensitiveMatch: true,
reloadOnSearch: false
})
.otherwise({redirectTo: '/'});

View File

@@ -42,7 +42,7 @@ declare module ng.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?: any;
controller?: string|Function;
/**
* A controller alias name. If present the controller will be published to scope under the controllerAs name.
*/