@@ -10,14 +10,16 @@ import { Subscription } from 'rxjs/Subscription';
10
10
import { Observable } from 'rxjs/Observable' ;
11
11
import { BehaviorSubject } from 'rxjs/BehaviorSubject' ;
12
12
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' ;
18
20
19
21
/** @internalapi */
20
- interface TransEvt { evt : string , trans : Transition }
22
+ interface TransEvt { evt : string ; trans : Transition ; }
21
23
22
24
/**
23
25
* UISref status emitted from [[UISrefStatus]]
@@ -61,7 +63,7 @@ const pathMatches = (target: TargetState): Predicate<PathNode[]> => {
61
63
return ( path : PathNode [ ] ) => {
62
64
let tailNode = tail ( path ) ;
63
65
if ( ! tailNode || tailNode . state !== state ) return false ;
64
- var paramValues = PathFactory . paramValues ( path ) ;
66
+ let paramValues = PathFactory . paramValues ( path ) ;
65
67
return Param . equals ( paramSchema , paramValues , targetParamVals ) ;
66
68
} ;
67
69
} ;
@@ -199,33 +201,33 @@ export class UISrefStatus {
199
201
ngAfterContentInit ( ) {
200
202
// Map each transition start event to a stream of:
201
203
// 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 ) => {
203
205
const event = ( evt : string ) => ( { evt, trans} as TransEvt ) ;
204
206
205
- let transStart$ = Observable . of ( event ( "start" ) ) ;
207
+ let transStart$ = of ( event ( "start" ) ) ;
206
208
let transResult = trans . promise . then ( ( ) => event ( "success" ) , ( ) => event ( "error" ) ) ;
207
- let transFinish$ = Observable . fromPromise ( transResult ) ;
209
+ let transFinish$ = fromPromise ( transResult ) ;
208
210
209
- return transStart$ . concat ( transFinish$ ) ;
211
+ return concat . call ( transStart$ , transFinish$ ) ;
210
212
} ) ;
211
213
212
214
// Watch the @ContentChildren UISref[] components and get their target states
213
215
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);
215
217
this . _srefs$ = new BehaviorSubject ( this . srefs . toArray ( ) ) ;
216
218
this . _srefChangesSub = this . srefs . changes . subscribe ( srefs => this . _srefs$ . next ( srefs ) ) ;
217
219
218
220
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$ ) ) ) ;
221
223
222
224
// Calculate the status of each UISref based on the transition event.
223
225
// 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 [ ] ) => {
226
228
let statuses : SrefStatus [ ] = targets . map ( target => getSrefStatus ( evt , target ) ) ;
227
- return statuses . reduce ( mergeSrefStatus )
228
- } )
229
+ return statuses . reduce ( mergeSrefStatus ) ;
230
+ } ) ;
229
231
} ) . subscribe ( this . _setStatus . bind ( this ) ) ;
230
232
}
231
233
0 commit comments