Skip to content

fix(firebase_*_factory.js): Fix calls to off() #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2016
+18 −14
Merged

fix(firebase_*_factory.js): Fix calls to off() #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions src/database/firebase_list_factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import 'rxjs/add/operator/mergeMap';
import 'rxjs/add/operator/map';

export function FirebaseListFactory (
absoluteUrlOrDbRef:string |
firebase.database.Reference |
firebase.database.Query,
absoluteUrlOrDbRef:string |
firebase.database.Reference |
firebase.database.Query,
{preserveSnapshot, query = {}}:FirebaseListFactoryOpts = {}): FirebaseListObservable<any> {

let ref: firebase.database.Reference | firebase.database.Query;

utils.checkForUrlOrFirebaseRef(absoluteUrlOrDbRef, {
Expand Down Expand Up @@ -95,7 +95,7 @@ export function FirebaseListFactory (
return firebaseListObservable(queryRef, { preserveSnapshot });
})
.subscribe(subscriber);

return () => sub.unsubscribe();
});
}
Expand All @@ -118,7 +118,7 @@ function firebaseListObservable(ref: firebase.database.Reference | firebase.data
obs.complete()
});

ref.on('child_added', (child: any, prevKey: string) => {
let addFn = ref.on('child_added', (child: any, prevKey: string) => {
arr = onChildAdded(arr, child, prevKey);
// only emit the array after the initial load
if (hasInitialLoad) {
Expand All @@ -128,7 +128,7 @@ function firebaseListObservable(ref: firebase.database.Reference | firebase.data
if (err) { obs.error(err); obs.complete(); }
});

ref.on('child_removed', (child: any) => {
let remFn = ref.on('child_removed', (child: any) => {
arr = onChildRemoved(arr, child)
if (hasInitialLoad) {
obs.next(preserveSnapshot ? arr : arr.map(utils.unwrapMapFn));
Expand All @@ -137,7 +137,7 @@ function firebaseListObservable(ref: firebase.database.Reference | firebase.data
if (err) { obs.error(err); obs.complete(); }
});

ref.on('child_changed', (child: any, prevKey: string) => {
let chgFn = ref.on('child_changed', (child: any, prevKey: string) => {
arr = onChildChanged(arr, child, prevKey)
if (hasInitialLoad) {
// This also manages when the only change is prevKey change
Expand All @@ -147,7 +147,11 @@ function firebaseListObservable(ref: firebase.database.Reference | firebase.data
if (err) { obs.error(err); obs.complete(); }
});

return () => ref.off();
return () => {
ref.off('child_added', addFn);
ref.off('child_removed', remFn);
ref.off('child_changed', chgFn);
}
});
return listObs;
}
Expand Down
10 changes: 5 additions & 5 deletions src/database/firebase_object_factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import { FirebaseObjectFactoryOpts } from '../interfaces';
import 'rxjs/add/operator/mergeMap';

export function FirebaseObjectFactory (
absoluteUrlOrDbRef: string | firebase.database.Reference,
absoluteUrlOrDbRef: string | firebase.database.Reference,
{ preserveSnapshot, query }: FirebaseObjectFactoryOpts = {}): FirebaseObjectObservable<any> {

let ref: firebase.database.Reference;

utils.checkForUrlOrFirebaseRef(absoluteUrlOrDbRef, {
Expand All @@ -19,12 +19,12 @@ export function FirebaseObjectFactory (
});

return new FirebaseObjectObservable((obs: Observer<any>) => {
ref.on('value', (snapshot: firebase.database.DataSnapshot) => {
let fn = ref.on('value', (snapshot: firebase.database.DataSnapshot) => {
obs.next(preserveSnapshot ? snapshot : utils.unwrapMapFn(snapshot))
}, err => {
if (err) { obs.error(err); obs.complete(); }
});

return () => ref.off();
return () => ref.off('value', fn);
}, ref);
}
}