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

feat(router): sibling outlets

Browse Source
This commit is contained in:
Brian Ford
2015-05-03 20:25:04 -07:00
parent 2713b7877b
commit 9d5c33f9dd
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/angular2/src/router/router_outlet.js vendored
View File

@ -1,6 +1,8 @@
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {isBlank} from 'angular2/src/facade/lang';
import {Directive} from 'angular2/src/core/annotations_impl/annotations';
import {Attribute} from 'angular2/src/core/annotations_impl/di';
import {Compiler, ViewContainerRef} from 'angular2/core';
import {Injector, bind} from 'angular2/di';
@ -16,12 +18,15 @@ export class RouterOutlet {
_router:routerMod.Router;
_viewContainer:ViewContainerRef;
constructor(viewContainer:ViewContainerRef, compiler:Compiler, router:routerMod.Router, injector:Injector) {
constructor(viewContainer:ViewContainerRef, compiler:Compiler, router:routerMod.Router, injector:Injector, @Attribute('name') nameAttr) {
if (isBlank(nameAttr)) {
nameAttr = 'default';
}
this._router = router;
this._viewContainer = viewContainer;
this._compiler = compiler;
this._injector = injector;
this._router.registerOutlet(this);
this._router.registerOutlet(this, nameAttr);
}
activate(instruction:Instruction) {