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

fix(router): remove a circular dep

This commit is contained in:
vsavkin 2016-07-06 11:32:42 -07:00
parent ad3f18c0dd
commit 6bfd514caf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/router/src/common_router_providers.ts
View File

@ -11,11 +11,11 @@ import {APP_INITIALIZER, AppModuleFactoryLoader, ApplicationRef, ComponentResolv
import {RouterConfig} from './config'; import {RouterConfig} from './config';
import {Router} from './router'; import {Router} from './router';
import {ROUTER_CONFIG} from './router_config_loader';
import {RouterOutletMap} from './router_outlet_map'; import {RouterOutletMap} from './router_outlet_map';
import {ActivatedRoute} from './router_state'; import {ActivatedRoute} from './router_state';
import {DefaultUrlSerializer, UrlSerializer} from './url_tree'; import {DefaultUrlSerializer, UrlSerializer} from './url_tree';
export const ROUTER_CONFIG = new OpaqueToken('ROUTER_CONFIG');
export const ROUTER_OPTIONS = new OpaqueToken('ROUTER_OPTIONS'); export const ROUTER_OPTIONS = new OpaqueToken('ROUTER_OPTIONS');
/** /**

5
modules/@angular/router/src/router_config_loader.ts
View File

@ -6,13 +6,14 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {AppModuleFactoryLoader, AppModuleRef, ComponentFactoryResolver} from '@angular/core'; import {AppModuleFactoryLoader, AppModuleRef, ComponentFactoryResolver, OpaqueToken} from '@angular/core';
import {Observable} from 'rxjs/Observable'; import {Observable} from 'rxjs/Observable';
import {fromPromise} from 'rxjs/observable/fromPromise'; import {fromPromise} from 'rxjs/observable/fromPromise';
import {ROUTER_CONFIG} from './common_router_providers';
import {Route} from './config'; import {Route} from './config';
export const ROUTER_CONFIG = new OpaqueToken('ROUTER_CONFIG');
export class LoadedRouterConfig { export class LoadedRouterConfig {
constructor(public routes: Route[], public factoryResolver: ComponentFactoryResolver) {} constructor(public routes: Route[], public factoryResolver: ComponentFactoryResolver) {}
} }