wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'angular-ui-router' of https://github.com/pocesar/DefinitelyTyped into pocesar-angular-ui-router

Browse Source
This commit is contained in:
vvakame
2015-10-05 22:40:20 +09:00
parent b8687a4c62 e8c8cfa1d4
commit a694252d47
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
angular-ui-router/angular-ui-router-tests.ts
+9 -2
View File
@@ -70,6 +70,13 @@ myApp.config((
$scope.items = ["A", "List", "Of", "Items"];
}
})
.state('state1.list', {
url: "/list",
templateUrl: "partials/state1.list.html",
controller: ['$scope', function ($scope: MyAppScope) {
$scope.items = ["A", "List", "Of", "Items"];
}]
})
.state('state2', {
url: "/state2",
templateUrl: "partials/state2.html"
@@ -173,7 +180,7 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
this.$state.get("myState");
this.$state.get();
this.$state.reload();
// http://angular-ui.github.io/ui-router/site/#/api/ui.router.state.$state#properties
if (this.$state.transition) {
var transitionPromise: ng.IPromise<{}> = this.$state.transition;
@@ -187,7 +194,7 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
// transition ended (success or failure)
});
}
// Accesses the currently resolved values for the current state
// http://stackoverflow.com/questions/28026620/is-there-a-way-to-access-resolved-state-dependencies-besides-injecting-them-into/28027023#28027023
var resolvedValues = this.$state.$current.locals.globals;
angular-ui-router/angular-ui-router.d.ts
Vendored
+15 -15
View File
@@ -26,24 +26,24 @@ declare module angular.ui {
/**
* Function, returns HTML content string
*/
templateProvider?: Function | Array<any>;
templateProvider?: Function | Array<string|Function>;
/**
* A controller paired to the state. Function OR name as String
* A controller paired to the state. Function, annotated array or name as String
*/
controller?: Function | string;
controller?: Function|string|Array<string|Function>;
controllerAs?: string;
/**
* Function (injectable), returns the actual controller function or string.
*/
controllerProvider?: Function;
controllerProvider?: Function|Array<string|Function>;
/**
* Specifies the parent state of this state
*/
parent?: string | IState
resolve?: {};
parent?: string | IState;
resolve?: { [name:string]: any };
/**
* 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.
*/
@@ -55,18 +55,18 @@ declare module angular.ui {
/**
* Use the views property to set up multiple views. If you don't need multiple views within a single state this property is not needed. Tip: remember that often nested views are more useful and powerful than multiple sibling views.
*/
views?: {};
views?: { [name:string]: IState };
abstract?: boolean;
/**
* Callback function for when a state is entered. Good way to trigger an action or dispatch an event, such as opening a dialog.
* If minifying your scripts, make sure to explicitly annotate this function, because it won't be automatically annotated by your build tools.
*/
onEnter?: Function|(string|Function)[];
onEnter?: Function|Array<string|Function>;
/**
* Callback functions for when a state is entered and exited. Good way to trigger an action or dispatch an event, such as opening a dialog.
* If minifying your scripts, make sure to explicitly annotate this function, because it won't be automatically annotated by your build tools.
*/
onExit?: Function|(string|Function)[];
onExit?: Function|Array<string|Function>;
/**
* Arbitrary data object, useful for custom configuration.
*/
@@ -245,13 +245,13 @@ declare module angular.ui {
/** A param object, e.g. {sectionId: section.id)}, that you'd like to test against the current active state. */
params: IStateParamsService;
reload(): void;
/** Currently pending transition. A promise that'll resolve or reject. */
transition: ng.IPromise<{}>;
$current: IResolvedState;
}
interface IResolvedState {
locals: {
/**