1
1
import { Injectable } from '@angular/core' ;
2
2
3
3
import { Observable } from 'rxjs/Observable' ;
4
- import { Subscriber } from 'rxjs/Subscriber ' ;
4
+ import { Observer } from 'rxjs/Observer ' ;
5
5
6
6
import { Hero , HeroTaxReturn } from './hero' ;
7
7
@@ -18,30 +18,30 @@ export class HeroesService {
18
18
] ;
19
19
20
20
getHeroes ( ) : Observable < Hero [ ] > {
21
- return new Observable < Hero [ ] > ( ( subscriber : Subscriber < Hero [ ] > ) => {
22
- subscriber . next ( this . heroes ) ;
23
- subscriber . complete ( ) ;
21
+ return new Observable < Hero [ ] > ( ( observer : Observer < Hero [ ] > ) => {
22
+ observer . next ( this . heroes ) ;
23
+ observer . complete ( ) ;
24
24
} ) ;
25
25
}
26
26
27
27
getTaxReturn ( hero : Hero ) : Observable < HeroTaxReturn > {
28
- return new Observable < HeroTaxReturn > ( ( subscriber : Subscriber < HeroTaxReturn > ) => {
28
+ return new Observable < HeroTaxReturn > ( ( observer : Observer < HeroTaxReturn > ) => {
29
29
const htr = this . heroTaxReturns . find ( t => t . hero . id === hero . id ) ;
30
- subscriber . next ( htr || new HeroTaxReturn ( 0 , hero ) ) ;
31
- subscriber . complete ( ) ;
30
+ observer . next ( htr || new HeroTaxReturn ( 0 , hero ) ) ;
31
+ observer . complete ( ) ;
32
32
} ) ;
33
33
}
34
34
35
35
saveTaxReturn ( heroTaxReturn : HeroTaxReturn ) : Observable < HeroTaxReturn > {
36
- return new Observable < HeroTaxReturn > ( ( subscriber : Subscriber < HeroTaxReturn > ) => {
36
+ return new Observable < HeroTaxReturn > ( ( observer : Observer < HeroTaxReturn > ) => {
37
37
const htr = this . heroTaxReturns . find ( t => t . id === heroTaxReturn . id ) ;
38
38
if ( htr ) {
39
39
heroTaxReturn = Object . assign ( htr , heroTaxReturn ) ; // demo: mutate
40
40
} else {
41
41
this . heroTaxReturns . push ( heroTaxReturn ) ;
42
42
}
43
- subscriber . next ( heroTaxReturn ) ;
44
- subscriber . complete ( ) ;
43
+ observer . next ( heroTaxReturn ) ;
44
+ observer . complete ( ) ;
45
45
} ) ;
46
46
}
47
47
}
0 commit comments