feat(router): guards and data resolvers can now return promises

This commit is contained in:
vsavkin
2016-07-13 15:25:48 -07:00
parent 9e3d13f61f
commit a5dc5705a3
4 changed files with 41 additions and 2 deletions

View File

@ -12,6 +12,7 @@ import 'rxjs/add/operator/mergeAll';
import 'rxjs/add/operator/reduce';
import 'rxjs/add/operator/every';
import 'rxjs/add/observable/from';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/observable/forkJoin';
import 'rxjs/add/observable/of';
@ -596,6 +597,8 @@ class PreActivation {
function wrapIntoObservable<T>(value: T | Observable<T>): Observable<T> {
if (value instanceof Observable) {
return value;
} else if (value instanceof Promise) {
return Observable.fromPromise(value);
} else {
return Observable.of(value);
}