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

fix(router): do not use rx/add/operator

Browse Source
This commit is contained in:
vsavkin
2016-08-30 14:25:46 -07:00
committed by Victor Berchet
parent 6e40ef0f6d
commit c350ba29f6
6 changed files with 177 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/@angular/router/src/utils/collection.ts
View File

@ -6,12 +6,14 @@
* found in the LICENSE file at https://angular.io/license
*/
import 'rxjs/add/operator/concatAll';
import 'rxjs/add/operator/last';
import {Observable} from 'rxjs/Observable';
import {fromPromise} from 'rxjs/observable/fromPromise';
import {of } from 'rxjs/observable/of';
import {concatAll} from 'rxjs/operator/concatAll';
import {every} from 'rxjs/operator/every';
import * as l from 'rxjs/operator/last';
import {map} from 'rxjs/operator/map';
import {mergeAll} from 'rxjs/operator/mergeAll';
import {PRIMARY_OUTLET} from '../shared';
@ -95,7 +97,7 @@ export function waitForMap<A, B>(
forEach(obj, (a: A, k: string) => {
if (k === PRIMARY_OUTLET) {
waitFor.push(fn(k, a).map((_: B) => {
waitFor.push(map.call(fn(k, a), (_: B) => {
res[k] = _;
return _;
}));
@ -104,7 +106,7 @@ export function waitForMap<A, B>(
forEach(obj, (a: A, k: string) => {
if (k !== PRIMARY_OUTLET) {
waitFor.push(fn(k, a).map((_: B) => {
waitFor.push(map.call(fn(k, a), (_: B) => {
res[k] = _;
return _;
}));
@ -112,14 +114,17 @@ export function waitForMap<A, B>(
});
if (waitFor.length > 0) {
return of (...waitFor).concatAll().last().map((last) => res);
const concatted$ = concatAll.call(of (...waitFor));
const last$ = l.last.call(concatted$);
return map.call(last$, () => res);
} else {
return of (res);
}
}
export function andObservables(observables: Observable<Observable<any>>): Observable<boolean> {
return observables.mergeAll().every(result => result === true);
const merged$ = mergeAll.call(observables);
return every.call(merged$, (result: any) => result === true);
}
export function wrapIntoObservable<T>(value: T | Promise<T>| Observable<T>): Observable<T> {