Merge pull request #613 from firebase/kato-error

Fixes #589 - Cannot read property $$error of null
FirebaseExtended · May 1, 2015 · 86ea97e · 86ea97e
2 parents c7ad7d8 + d8c12c6
commit 86ea97e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/FirebaseArray.js b/src/FirebaseArray.js
@@ -672,7 +672,9 @@
         var isResolved = false;
         var error   = $firebaseUtils.batch(function(err) {
           _initComplete(err);
-          firebaseArray.$$error(err);
+          if( firebaseArray ) {
+            firebaseArray.$$error(err);
+          }
         });
         var initComplete = $firebaseUtils.batch(_initComplete);
 

diff --git a/src/FirebaseObject.js b/src/FirebaseObject.js
@@ -446,7 +446,12 @@
             firebaseObject.$$notify();
           }
         });
-        var error = $firebaseUtils.batch(firebaseObject.$$error, firebaseObject);
+        var error = $firebaseUtils.batch(function(err) {
+          _initComplete(err);
+          if( firebaseObject ) {
+            firebaseObject.$$error(err);
+          }
+        });
         var initComplete = $firebaseUtils.batch(_initComplete);
 
         var sync = {