feat(router): extend support for lazy loading children (#10705)

2016-08-15 21:11:09 -07:00
parent bec5c5fdad
commit 6b26102931
10 changed files with 84 additions and 25 deletions
--- a/modules/@angular/router/src/utils/collection.ts
+++ b/modules/@angular/router/src/utils/collection.ts
@ -122,7 +122,7 @@ export function andObservables(observables: Observable<Observable<any>>): Observ
  return observables.mergeAll().every(result => result === true);
 }

-export function wrapIntoObservable<T>(value: T | Observable<T>): Observable<T> {
+export function wrapIntoObservable<T>(value: T | Promise<T>| Observable<T>): Observable<T> {
  if (value instanceof Observable) {
    return value;
  } else if (value instanceof Promise) {