cargdev/angular
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(router): add route config validation

Browse Source
This commit is contained in:
vsavkin
2016-06-16 14:36:51 -07:00
parent 7e12208ca6
commit ca23b4c55f
4 changed files with 80 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/@angular/router/src/router.ts
View File

@ -15,7 +15,7 @@ import {Subscription} from 'rxjs/Subscription';
import {of } from 'rxjs/observable/of';
import {applyRedirects} from './apply_redirects';
import {RouterConfig} from './config';
import {RouterConfig, validateConfig} from './config';
import {createRouterState} from './create_router_state';
import {createUrlTree} from './create_url_tree';
import {RouterOutlet} from './directives/router_outlet';
@ -99,6 +99,7 @@ export class Router {
private locationSubscription: Subscription;
private routerEvents: Subject<Event>;
private navigationId: number = 0;
private config: RouterConfig;
/**
* @internal
@ -106,7 +107,8 @@ export class Router {
constructor(
private rootComponentType: Type, private resolver: ComponentResolver,
private urlSerializer: UrlSerializer, private outletMap: RouterOutletMap,
private location: Location, private injector: Injector, private config: RouterConfig) {
private location: Location, private injector: Injector, config: RouterConfig) {
this.resetConfig(config);
this.routerEvents = new Subject<Event>();
this.currentUrlTree = createEmptyUrlTree();
this.currentRouterState = createEmptyState(this.currentUrlTree, this.rootComponentType);
@ -149,7 +151,10 @@ export class Router {
* ]);
* ```
*/
resetConfig(config: RouterConfig): void { this.config = config; }
resetConfig(config: RouterConfig): void {
validateConfig(config);
this.config = config;
}
/**
* @internal