mirror of
https://github.com/wassname/DefinitelyTyped.git
synced 2026-08-26 11:12:19 +08:00
Merge pull request #4841 from site-tour/master
Use correct templateProvider and url definitions in angular.ui.IState.
This commit is contained in:
+2
-2
@@ -20,7 +20,7 @@ declare module angular.ui {
|
||||
/**
|
||||
* Function, returns HTML content string
|
||||
*/
|
||||
templateProvider?: Function;
|
||||
templateProvider?: Function | Array<any>;
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user