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

fix(router): update dts files

This commit is contained in:
vsavkin 2016-07-28 14:36:05 -07:00
parent bb8b82b3f5
commit 81d27daf0d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/@angular/router/src/router_module.ts
View File

@ -7,7 +7,7 @@
*/ */
import {APP_BASE_HREF, HashLocationStrategy, Location, LocationStrategy, PathLocationStrategy, PlatformLocation} from '@angular/common'; import {APP_BASE_HREF, HashLocationStrategy, Location, LocationStrategy, PathLocationStrategy, PlatformLocation} from '@angular/common';
import {ApplicationRef, ComponentResolver, Injector, ModuleWithProviders, NgModule, NgModuleFactoryLoader, OpaqueToken, SystemJsNgModuleLoader} from '@angular/core'; import {ApplicationRef, ComponentResolver, Inject, Injector, ModuleWithProviders, NgModule, NgModuleFactoryLoader, OpaqueToken, Optional, SystemJsNgModuleLoader} from '@angular/core';
import {ExtraOptions, ROUTER_CONFIGURATION, provideRouterConfig, provideRoutes, rootRoute, setupRouter} from './common_router_providers'; import {ExtraOptions, ROUTER_CONFIGURATION, provideRouterConfig, provideRoutes, rootRoute, setupRouter} from './common_router_providers';
import {Routes} from './config'; import {Routes} from './config';
@ -98,7 +98,9 @@ export class RouterModule {
{ {
provide: LocationStrategy, provide: LocationStrategy,
useFactory: provideLocationStrategy, useFactory: provideLocationStrategy,
deps: [PlatformLocation, APP_BASE_HREF, ROUTER_CONFIGURATION] deps: [
PlatformLocation, [new Inject(APP_BASE_HREF), new Optional()], ROUTER_CONFIGURATION
]
} }
] ]
}; };

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

@ -131,9 +131,21 @@ export declare type ResolveData = {
/** @stable */ /** @stable */
export interface Route { export interface Route {
canActivate?: any[];
canActivateChild?: any[];
canDeactivate?: any[];
canLoad?: any[];
children?: Route[];
component?: Type | string;
data?: Data;
loadChildren?: string;
outlet?: string;
path?: string; path?: string;
pathMatch?: pathMatch?: string;
redirectTo?: string;
resolve?: ResolveData;
/** @deprecated */ terminal?: boolean; /** @deprecated */ terminal?: boolean;
}
/** @stable */ /** @stable */
export declare class Router { export declare class Router {