Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit adec6ac

Browse files
authored
chore(hierarchical-dependency-injection): Subscriber -> Observer (#3097)
1 parent 8811094 commit adec6ac

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Injectable } from '@angular/core';
22

33
import { Observable } from 'rxjs/Observable';
4-
import { Subscriber } from 'rxjs/Subscriber';
4+
import { Observer } from 'rxjs/Observer';
55

66
import { Hero, HeroTaxReturn } from './hero';
77

@@ -18,30 +18,30 @@ export class HeroesService {
1818
];
1919

2020
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();
2424
});
2525
}
2626

2727
getTaxReturn(hero: Hero): Observable<HeroTaxReturn> {
28-
return new Observable<HeroTaxReturn>((subscriber: Subscriber<HeroTaxReturn>) => {
28+
return new Observable<HeroTaxReturn>((observer: Observer<HeroTaxReturn>) => {
2929
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();
3232
});
3333
}
3434

3535
saveTaxReturn(heroTaxReturn: HeroTaxReturn): Observable<HeroTaxReturn> {
36-
return new Observable<HeroTaxReturn>((subscriber: Subscriber<HeroTaxReturn>) => {
36+
return new Observable<HeroTaxReturn>((observer: Observer<HeroTaxReturn>) => {
3737
const htr = this.heroTaxReturns.find(t => t.id === heroTaxReturn.id);
3838
if (htr) {
3939
heroTaxReturn = Object.assign(htr, heroTaxReturn); // demo: mutate
4040
} else {
4141
this.heroTaxReturns.push(heroTaxReturn);
4242
}
43-
subscriber.next(heroTaxReturn);
44-
subscriber.complete();
43+
observer.next(heroTaxReturn);
44+
observer.complete();
4545
});
4646
}
4747
}

0 commit comments

Comments
 (0)