Merge pull request #618 from firebase/kato-617

Fixes #617 - $loaded() triggered too soon

Author: Jacob Wenger

src/FirebaseArray.js

@@ -630,43 +630,39 @@
         }
 
         var def     = $firebaseUtils.defer();
-        var created = $firebaseUtils.batch(function(snap, prevChild) {
+        var created = function(snap, prevChild) {
           var rec = firebaseArray.$$added(snap, prevChild);
-          if( rec ) {
-            $firebaseUtils.resolve(rec).then(function(rec) {
-              if( rec ) {
-                firebaseArray.$$process('child_added', rec, prevChild);
-              }
-            });
-          }
-        });
-        var updated = $firebaseUtils.batch(function(snap) {
+          $firebaseUtils.whenUnwrapped(rec, function(rec) {
+            firebaseArray.$$process('child_added', rec, prevChild);
+          });
+        };
+        var updated = function(snap) {
           var rec = firebaseArray.$getRecord($firebaseUtils.getKey(snap));
           if( rec ) {
-            var changed = firebaseArray.$$updated(snap);
-            if( changed ) {
+            var res = firebaseArray.$$updated(snap);
+            $firebaseUtils.whenUnwrapped(res, function() {
               firebaseArray.$$process('child_changed', rec);
-            }
+            });
           }
-        });
-        var moved   = $firebaseUtils.batch(function(snap, prevChild) {
+        };
+        var moved   = function(snap, prevChild) {
           var rec = firebaseArray.$getRecord($firebaseUtils.getKey(snap));
           if( rec ) {
-            var confirmed = firebaseArray.$$moved(snap, prevChild);
-            if( confirmed ) {
+            var res = firebaseArray.$$moved(snap, prevChild);
+            $firebaseUtils.whenUnwrapped(res, function() {
               firebaseArray.$$process('child_moved', rec, prevChild);
-            }
+            });
           }
-        });
-        var removed = $firebaseUtils.batch(function(snap) {
+        };
+        var removed = function(snap) {
           var rec = firebaseArray.$getRecord($firebaseUtils.getKey(snap));
           if( rec ) {
-            var confirmed = firebaseArray.$$removed(snap);
-            if( confirmed ) {
+            var res = firebaseArray.$$removed(snap);
+            $firebaseUtils.whenUnwrapped(res, function() {
               firebaseArray.$$process('child_removed', rec);
-            }
+            });
           }
-        });
+        };
 
         var isResolved = false;
         var error   = $firebaseUtils.batch(function(err) {

src/utils.js

@@ -61,7 +61,7 @@
           batch: function(action, context) {
             return function() {
               var args = Array.prototype.slice.call(arguments, 0);
-              $rootScope.$evalAsync(function() {
+              utils.compile(function() {
                 action.apply(context, args);
               });
             };
@@ -182,6 +182,16 @@
 
           resolve: $q.when,
 
+          whenUnwrapped: function(possiblePromise, callback) {
+            if( possiblePromise ) {
+              utils.resolve(possiblePromise).then(function(res) {
+                if( res ) {
+                  callback(res);
+                }
+              });
+            }
+          },
+
           //TODO: Remove false branch and use only angular implementation when we drop angular 1.2.x support.
           promise: angular.isFunction($q) ? $q : Q,
 
@@ -210,7 +220,7 @@
           },
 
           compile: function(fn) {
-            return $timeout(fn||function() {});
+            return $rootScope.$evalAsync(fn||function() {});
           },
 
           deepCopy: function(obj) {

tests/unit/FirebaseArray.spec.js

@@ -417,6 +417,14 @@ describe('$firebaseArray', function () {
       expect(spy).toHaveBeenCalledWith(arr);
     });
 
+    it('should have all data loaded when it resolves', function() {
+      var spy = jasmine.createSpy('resolve');
+      arr.$loaded().then(spy);
+      flushAll();
+      var list = spy.calls.argsFor(0)[0];
+      expect(list.length).toBe(5);
+    });
+
     it('should reject when error fetching records', function() {
       var whiteSpy = jasmine.createSpy('resolve');
       var blackSpy = jasmine.createSpy('reject');