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

chore: add lint and clang-format

Browse Source
This commit is contained in:
Victor Berchet
2016-06-07 09:50:35 -07:00
committed by vsavkin
parent 56f8c95ee9
commit dadd5ddded
6 changed files with 89 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ 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) {
this.routerEvents = new Subject<Event>();
this.currentUrlTree = createEmptyUrlTree()
this.currentUrlTree = createEmptyUrlTree();
this.currentRouterState = createEmptyState(this.rootComponentType);
}
@ -275,7 +275,7 @@ class GuardChecks {
if (this.checks.length === 0) return of(true);
return forkJoin(this.checks.map(s => {
if (s instanceof CanActivate) {
return this.runCanActivate(s.route)
return this.runCanActivate(s.route);
} else if (s instanceof CanDeactivate) {
return this.runCanDeactivate(s.component, s.route);
} else {
@ -316,7 +316,7 @@ class GuardChecks {
private deactivateOutletAndItChildren(route: ActivatedRouteSnapshot, outlet: RouterOutlet): void {
if (outlet && outlet.isActivated) {
forEach(outlet.outletMap._outlets, (v, k) => this.deactivateOutletAndItChildren(v, outlet.outletMap._outlets[k]));
this.checks.push(new CanDeactivate(outlet.component, route))
this.checks.push(new CanDeactivate(outlet.component, route));
}
}