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

feat(router): add support for using classes as guard

Browse Source
This commit is contained in:
vsavkin
2016-06-02 15:29:15 -07:00
parent f04b6978fb
commit f34af4f249
5 changed files with 81 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,7 +254,11 @@ class GuardChecks {
if (!canActivate || canActivate.length === 0) return of(true);
return forkJoin(canActivate.map(c => {
const guard = this.injector.get(c);
return of(guard(future, this.future));
if (guard.canActivate) {
return of(guard.canActivate(future, this.future));
} else {
return of(guard(future, this.future));
}
})).map(and);
}
@ -263,7 +267,11 @@ class GuardChecks {
if (!canDeactivate || canDeactivate.length === 0) return of(true);
return forkJoin(canDeactivate.map(c => {
const guard = this.injector.get(c);
return of(guard(component, curr, this.curr));
if (guard.canDeactivate) {
return of(guard.canDeactivate(component, curr, this.curr));
} else {
return of(guard(component, curr, this.curr));
}
})).map(and);
}
}