iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(router): Use T type in Resolve interface (#13242)

This commit is contained in:
Jónatan Núñez 2016-12-08 20:24:38 +01:00 committed by Victor Berchet
parent 65965c27a8
commit 9591a08dfb
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/@angular/router/src/interfaces.ts
View File

@ -305,8 +305,7 @@ export interface CanDeactivate<T> {
* @stable * @stable
*/ */
export interface Resolve<T> { export interface Resolve<T> {
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<T>|Promise<T>|T;
Observable<any>|Promise<any>|any;
} }

2
modules/@angular/router/test/integration.spec.ts
View File

@ -780,7 +780,7 @@ describe('Integration', () => {
}))); })));
describe('data', () => { describe('data', () => {
class ResolveSix implements Resolve<TeamCmp> { class ResolveSix implements Resolve<number> {
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): number { return 6; } resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): number { return 6; }
} }

2
tools/public_api_guard/router/index.d.ts vendored
View File

@ -172,7 +172,7 @@ export declare function provideRoutes(routes: Routes): any;
/** @stable */ /** @stable */
export interface Resolve<T> { export interface Resolve<T> {
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any> | Promise<any> | any; resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<T> | Promise<T> | T;
} }
/** @stable */ /** @stable */