Merge pull request #6320 from MarkBouwman/angular-ui-router-reload

angular-ui-router: transitionTo() and reload() return promises
This commit is contained in:
Masahiro Wakame
2015-10-17 00:14:38 +09:00
+5 -5
View File
@@ -229,10 +229,10 @@ declare module angular.ui {
*/
go(to: string, params?: {}, options?: IStateOptions): angular.IPromise<any>;
go(to: IState, params?: {}, options?: IStateOptions): angular.IPromise<any>;
transitionTo(state: string, params?: {}, updateLocation?: boolean): void;
transitionTo(state: IState, params?: {}, updateLocation?: boolean): void;
transitionTo(state: string, params?: {}, options?: IStateOptions): void;
transitionTo(state: IState, params?: {}, options?: IStateOptions): void;
transitionTo(state: string, params?: {}, updateLocation?: boolean): ng.IPromise<any>;
transitionTo(state: IState, params?: {}, updateLocation?: boolean): ng.IPromise<any>;
transitionTo(state: string, params?: {}, options?: IStateOptions): ng.IPromise<any>;
transitionTo(state: IState, params?: {}, options?: IStateOptions): ng.IPromise<any>;
includes(state: string, params?: {}): boolean;
is(state:string, params?: {}): boolean;
is(state: IState, params?: {}): boolean;
@@ -244,7 +244,7 @@ declare module angular.ui {
current: IState;
/** A param object, e.g. {sectionId: section.id)}, that you'd like to test against the current active state. */
params: IStateParamsService;
reload(): void;
reload(): ng.IPromise<any>;
/** Currently pending transition. A promise that'll resolve or reject. */
transition: ng.IPromise<{}>;