Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit 86ea97e

Browse files
committed
Merge pull request #613 from firebase/kato-error
Fixes #589 - Cannot read property $$error of null
2 parents c7ad7d8 + d8c12c6 commit 86ea97e

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/FirebaseArray.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,9 @@
672672
var isResolved = false;
673673
var error = $firebaseUtils.batch(function(err) {
674674
_initComplete(err);
675-
firebaseArray.$$error(err);
675+
if( firebaseArray ) {
676+
firebaseArray.$$error(err);
677+
}
676678
});
677679
var initComplete = $firebaseUtils.batch(_initComplete);
678680

src/FirebaseObject.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,12 @@
446446
firebaseObject.$$notify();
447447
}
448448
});
449-
var error = $firebaseUtils.batch(firebaseObject.$$error, firebaseObject);
449+
var error = $firebaseUtils.batch(function(err) {
450+
_initComplete(err);
451+
if( firebaseObject ) {
452+
firebaseObject.$$error(err);
453+
}
454+
});
450455
var initComplete = $firebaseUtils.batch(_initComplete);
451456

452457
var sync = {

0 commit comments

Comments
 (0)