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

[WIP] chore(hierarchical-dependency-injection): Subscriber -> Observer #3097

Merged
merged 1 commit into from
Feb 1, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';

import { Observable } from 'rxjs/Observable';
import { Subscriber } from 'rxjs/Subscriber';
import { Observer } from 'rxjs/Observer';

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

Expand All @@ -18,30 +18,30 @@ export class HeroesService {
];

getHeroes(): Observable<Hero[]> {
return new Observable<Hero[]>((subscriber: Subscriber<Hero[]>) => {
subscriber.next(this.heroes);
subscriber.complete();
return new Observable<Hero[]>((observer: Observer<Hero[]>) => {
observer.next(this.heroes);
observer.complete();
});
}

getTaxReturn(hero: Hero): Observable<HeroTaxReturn> {
return new Observable<HeroTaxReturn>((subscriber: Subscriber<HeroTaxReturn>) => {
return new Observable<HeroTaxReturn>((observer: Observer<HeroTaxReturn>) => {
const htr = this.heroTaxReturns.find(t => t.hero.id === hero.id);
subscriber.next(htr || new HeroTaxReturn(0, hero));
subscriber.complete();
observer.next(htr || new HeroTaxReturn(0, hero));
observer.complete();
});
}

saveTaxReturn(heroTaxReturn: HeroTaxReturn): Observable<HeroTaxReturn> {
return new Observable<HeroTaxReturn>((subscriber: Subscriber<HeroTaxReturn>) => {
return new Observable<HeroTaxReturn>((observer: Observer<HeroTaxReturn>) => {
const htr = this.heroTaxReturns.find(t => t.id === heroTaxReturn.id);
if (htr) {
heroTaxReturn = Object.assign(htr, heroTaxReturn); // demo: mutate
} else {
this.heroTaxReturns.push(heroTaxReturn);
}
subscriber.next(heroTaxReturn);
subscriber.complete();
observer.next(heroTaxReturn);
observer.complete();
});
}
}