firebase.js: Fixes comments and URL in $firebase error.

utils.js: reject promise if once fails
chat.js: removed superfluous transaction code
priority.js: fix comment referring to FirebaseArray vs FirebaseObject
FirebaseArray.js,FirebaseObject.js: renamed resolve method to initComplete for clarity

Author: katowulf

src/FirebaseArray.js

@@ -584,7 +584,7 @@
             ref.off('child_changed', updated);
             ref.off('child_removed', removed);
             firebaseArray = null;
-            resolve(err||'destroyed');
+            initComplete(err||'destroyed');
           }
         }
 
@@ -603,12 +603,12 @@
               $log.warn('Storing data using array indices in Firebase can result in unexpected behavior. See https://www.firebase.com/docs/web/guide/understanding-data.html#section-arrays-in-firebase for more information.');
             }
 
-            resolve(null, $list);
-          }, resolve);
+            initComplete(null, $list);
+          }, initComplete);
         }
 
-        // call resolve(), do not call this directly
-        function _resolveFn(err, result) {
+        // call initComplete(), do not call this directly
+        function _initComplete(err, result) {
           if( !isResolved ) {
             isResolved = true;
             if( err ) { def.reject(err); }
@@ -654,10 +654,10 @@
 
         var isResolved = false;
         var error   = batch(function(err) {
-          _resolveFn(err);
+          _initComplete(err);
           firebaseArray.$$error(err);
         });
-        var resolve = batch(_resolveFn);
+        var initComplete = batch(_initComplete);
 
         var sync = {
           destroy: destroy,

src/FirebaseObject.js

@@ -404,7 +404,7 @@
             sync.isDestroyed = true;
             ref.off('value', applyUpdate);
             firebaseObject = null;
-            resolve(err||'destroyed');
+            initComplete(err||'destroyed');
           }
         }
 
@@ -415,12 +415,12 @@
               $log.warn('Storing data using array indices in Firebase can result in unexpected behavior. See https://www.firebase.com/docs/web/guide/understanding-data.html#section-arrays-in-firebase for more information. Also note that you probably wanted $FirebaseArray and not $FirebaseObject.');
             }
 
-            resolve(null);
-          }, resolve);
+            initComplete(null);
+          }, initComplete);
         }
 
-        // call resolve(); do not call this directly
-        function _resolveFn(err) {
+        // call initComplete(); do not call this directly
+        function _initComplete(err) {
           if( !isResolved ) {
             isResolved = true;
             if( err ) { def.reject(err); }
@@ -440,7 +440,7 @@
           }
         });
         var error = batch(firebaseObject.$$error, firebaseObject);
-        var resolve = batch(_resolveFn);
+        var initComplete = batch(_initComplete);
 
         var sync = {
           isDestroyed: false,

src/firebase.js

@@ -8,7 +8,7 @@
       return function() {
         throw new Error('$firebase has been removed. You may instantiate $FirebaseArray and $FirebaseObject ' +
         'directly now. For simple write operations, just use the Firebase ref directly. ' +
-        'See CHANGELOG for details and migration instructions: https://www.firebase.com/docs/web/changelog.html');
+        'See the AngularFire 1.0.0 changelog for details: https://www.firebase.com/docs/web/changelog.html');
       };
     });
 

src/utils.js

@@ -449,6 +449,8 @@
                   }
                 });
                 ref.ref().update(dataCopy, utils.makeNodeResolver(def));
+              }, function(err) {
+                def.reject(err);
               });
             }
             return def.promise;
@@ -478,6 +480,8 @@
                     def.reject(err);
                   }
                 );
+              }, function(err) {
+                def.reject(err);
               });
             }
             return def.promise;

tests/protractor/chat/chat.js

@@ -3,7 +3,6 @@ app.controller('ChatCtrl', function Chat($scope, $FirebaseObject, $FirebaseArray
   // Get a reference to the Firebase
   var chatFirebaseRef = new Firebase('https://angularFireTests.firebaseio-demo.com/chat');
   var messagesFirebaseRef = chatFirebaseRef.child("messages").limitToLast(2);
-  var numMessagesFirebaseRef = chatFirebaseRef.child("numMessages");
 
   // Get AngularFire sync objects
 
@@ -37,33 +36,6 @@ app.controller('ChatCtrl', function Chat($scope, $FirebaseObject, $FirebaseArray
 
       // Reset the message input
       $scope.message = "";
-
-      // Increment the messages count by 1
-      numMessagesFirebaseRef.transaction(function (currentCount) {
-        if (currentCount === null) {
-          // Set the initial value
-          return 1;
-        }
-        else if (currentCount < 0) {
-          // Return undefined to abort the transaction
-          return;
-        }
-        else {
-          // Increment the messages count by 1
-          return currentCount + 1;
-        }
-      }, function (error, committed, snapshot) {
-        if( error ) {
-          verify(false, "Messages count transaction errored: " + error);
-        }
-        else if(!committed) {
-          // Handle aborted transaction
-          verify(false, "Messages count transaction unexpectedly aborted.")
-        }
-        else {
-          // Success
-        }
-      });
     }
   };
 

tests/protractor/priority/priority.js

@@ -30,7 +30,7 @@ app.controller('PriorityCtrl', function Chat($scope, $FirebaseArray, $FirebaseOb
         var newItem = new $FirebaseObject(ref);
 
         newItem.$loaded().then(function (data) {
-          verify(newItem === data, '$FirebaseArray.$loaded() does not return correct value.');
+          verify(newItem === data, '$FirebaseObject.$loaded() does not return correct value.');
 
           // Update the message's priority
           newItem.$priority = priority;