Skip to content

Commit 26a74ef

Browse files
committed
fix(rxjs): import rxjs operators.
1 parent a112031 commit 26a74ef

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

src/directives/uiSrefStatus.ts

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ import { Subscription } from 'rxjs/Subscription';
1010
import { Observable } from 'rxjs/Observable';
1111
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
1212

13-
import 'rxjs/add/observable/of';
14-
import 'rxjs/add/observable/fromPromise';
15-
import 'rxjs/add/observable/combineLatest';
16-
import 'rxjs/add/operator/concat';
17-
import 'rxjs/add/operator/switchMap';
13+
import {of} from 'rxjs/observable/of';
14+
import {fromPromise} from 'rxjs/observable/fromPromise';
15+
import {combineLatest} from 'rxjs/observable/combineLatest';
16+
import {switchMap} from 'rxjs/operator/switchMap';
17+
import {mergeMap} from 'rxjs/operator/mergeMap';
18+
import {map} from 'rxjs/operator/map';
19+
import {concat} from 'rxjs/operator/concat';
1820

1921
/** @internalapi */
20-
interface TransEvt { evt: string, trans: Transition }
22+
interface TransEvt { evt: string; trans: Transition; }
2123

2224
/**
2325
* UISref status emitted from [[UISrefStatus]]
@@ -61,7 +63,7 @@ const pathMatches = (target: TargetState): Predicate<PathNode[]> => {
6163
return (path: PathNode[]) => {
6264
let tailNode = tail(path);
6365
if (!tailNode || tailNode.state !== state) return false;
64-
var paramValues = PathFactory.paramValues(path);
66+
let paramValues = PathFactory.paramValues(path);
6567
return Param.equals(paramSchema, paramValues, targetParamVals);
6668
};
6769
};
@@ -199,33 +201,33 @@ export class UISrefStatus {
199201
ngAfterContentInit() {
200202
// Map each transition start event to a stream of:
201203
// start -> (success|error)
202-
let transEvents$: Observable<TransEvt> = this._globals.start$.switchMap((trans: Transition) => {
204+
let transEvents$: Observable<TransEvt> = switchMap.call(this._globals.start$, (trans: Transition) => {
203205
const event = (evt: string) => ({evt, trans} as TransEvt);
204206

205-
let transStart$ = Observable.of(event("start"));
207+
let transStart$ = of(event("start"));
206208
let transResult = trans.promise.then(() => event("success"), () => event("error"));
207-
let transFinish$ = Observable.fromPromise(transResult);
209+
let transFinish$ = fromPromise(transResult);
208210

209-
return transStart$.concat(transFinish$);
211+
return concat.call(transStart$, transFinish$);
210212
});
211213

212214
// Watch the @ContentChildren UISref[] components and get their target states
213215

214-
// let srefs$: Observable<UISref[]> = Observable.of(this.srefs.toArray()).concat(this.srefs.changes);
216+
// let srefs$: Observable<UISref[]> = of(this.srefs.toArray()).concat(this.srefs.changes);
215217
this._srefs$ = new BehaviorSubject(this.srefs.toArray());
216218
this._srefChangesSub = this.srefs.changes.subscribe(srefs => this._srefs$.next(srefs));
217219

218220
let targetStates$: Observable<TargetState[]> =
219-
this._srefs$.switchMap((srefs: UISref[]) =>
220-
Observable.combineLatest<TargetState[]>(srefs.map(sref => sref.targetState$)));
221+
switchMap.call(this._srefs$, (srefs: UISref[]) =>
222+
combineLatest<TargetState[]>(srefs.map(sref => sref.targetState$)));
221223

222224
// Calculate the status of each UISref based on the transition event.
223225
// Reduce the statuses (if multiple) by or-ing each flag.
224-
this._subscription = transEvents$.mergeMap((evt: TransEvt) => {
225-
return targetStates$.map((targets: TargetState[]) => {
226+
this._subscription = mergeMap.call(transEvents$, (evt: TransEvt) => {
227+
return map.call(targetStates$, (targets: TargetState[]) => {
226228
let statuses: SrefStatus[] = targets.map(target => getSrefStatus(evt, target));
227-
return statuses.reduce(mergeSrefStatus)
228-
})
229+
return statuses.reduce(mergeSrefStatus);
230+
});
229231
}).subscribe(this._setStatus.bind(this));
230232
}
231233

0 commit comments

Comments
 (0)