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

feat(router): changes router config not to use names

Browse Source
This commit is contained in:
vsavkin
2016-05-26 16:51:44 -07:00
parent 2e1bd46bb1
commit 86f47273bc
5 changed files with 147 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/@angular/router/src/router_state.ts
View File

@ -1,19 +1,9 @@
import { Tree, TreeNode } from './utils/tree';
import { UrlSegment } from './url_tree';
import { Params, PRIMARY_OUTLET } from './shared';
import { Observable } from 'rxjs/Observable';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { ComponentFactory, Type } from '@angular/core';
/**
* A collection of parameters.
*/
export type Params = { [key: string]: string };
/**
* Name of the primary outlet.
* @type {string}
*/
export const PRIMARY_OUTLET: string = "PRIMARY_OUTLET";
import { Type } from '@angular/core';
/**
* The state of the router at a particular moment in time.
@ -37,11 +27,11 @@ export class RouterState extends Tree<ActivatedRoute> {
}
export function createEmptyState(rootComponent: Type): RouterState {
const emptyUrl = new BehaviorSubject([new UrlSegment("", {})]);
const emptyUrl = new BehaviorSubject([new UrlSegment("", {}, PRIMARY_OUTLET)]);
const emptyParams = new BehaviorSubject({});
const emptyQueryParams = new BehaviorSubject({});
const fragment = new BehaviorSubject("");
const activated = new ActivatedRoute(emptyUrl, emptyParams, PRIMARY_OUTLET, rootComponent, <any>null);
const activated = new ActivatedRoute(emptyUrl, emptyParams, PRIMARY_OUTLET, rootComponent);
return new RouterState(new TreeNode<ActivatedRoute>(activated, []), emptyQueryParams, fragment);
}
@ -62,6 +52,5 @@ export class ActivatedRoute {
constructor(public urlSegments: Observable<UrlSegment[]>,
public params: Observable<Params>,
public outlet: string,
public component: Type,
public factory: ComponentFactory<any>) {}
public component: Type | string) {}
}