From 480a6334716d1ae14d77935d5a1d2aef555f24c1 Mon Sep 17 00:00:00 2001 From: Andrew Done Date: Mon, 6 Jul 2015 15:55:19 +0100 Subject: [PATCH] Use correct templateProvider and url definitions in angular.ui.IState. - See https://github.com/angular-ui/ui-router/wiki/URL-Routing#urlmatcherfactory-and-urlmatchers for a use of url that is non-string. - templateProvider needs to accept an Array to allow it to participate in by-name DI within Angular. --- angular-ui-router/angular-ui-router.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angular-ui-router/angular-ui-router.d.ts b/angular-ui-router/angular-ui-router.d.ts index acc9342d9..18a6fb397 100644 --- a/angular-ui-router/angular-ui-router.d.ts +++ b/angular-ui-router/angular-ui-router.d.ts @@ -20,7 +20,7 @@ declare module angular.ui { /** * Function, returns HTML content string */ - templateProvider?: Function; + templateProvider?: Function | Array; /** * A controller paired to the state. Function OR name as String */ @@ -41,7 +41,7 @@ declare module angular.ui { /** * A url with optional parameters. When a state is navigated or transitioned to, the $stateParams service will be populated with any parameters that were passed. */ - url?: string; + url?: string | IUrlMatcher; /** * A map which optionally configures parameters declared in the url, or defines additional non-url parameters. Only use this within a state if you are not using url. Otherwise you can specify your parameters within the url. When a state is navigated or transitioned to, the $stateParams service will be populated with any parameters that were passed. */