Merge branch 'on-change-callback' of https://github.com/johnsoftek/angularFire into johnsoftek-on-change-callback

Author: anantn

angularfire.js

@@ -207,7 +207,7 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
     // argument, and a function as an optional second argument. The callback
     // (if provided in the 2nd argument) will be called with a Firebase
     // snapshot when the initial data has been loaded.
-    return function(collectionRef, initialCb) {
+    return function(collectionRef, initialCb, onItemChangeCb) {
       if (typeof collectionRef == "string") {
         throw new Error("Please provide a Firebase reference instead " +
           "of a URL, eg: new Firebase(url)");
@@ -248,6 +248,12 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
       var indexes = {};
       var collection = [];
 
+      function broadcastChange(type, item) {
+        if (onItemChangeCb && typeof onItemChangeCb == "function") {
+          onItemChangeCb(type, item);
+        }
+      }
+
       function getIndex(prevId) {
         return prevId ? indexes[prevId] + 1 : 0;
       }
@@ -302,17 +308,21 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
       collectionRef.on("child_added", function(data, prevId) {
         $timeout(function() {
           var index = getIndex(prevId);
-          addChild(index, new AngularFireItem(data, index));
+          var item = new AngularFireItem(data, index);
+          addChild(index, item);
           updateIndexes(index);
+          broadcastChange("item_added", item);
         });
       });
 
       collectionRef.on("child_removed", function(data) {
         $timeout(function() {
           var id = data.name();
           var pos = indexes[id];
+          var item = collection[pos];
           removeChild(id);
           updateIndexes(pos);
+          broadcastChange("item_removed", item);
         });
       });
 
@@ -321,11 +331,12 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
           var index = indexes[data.name()];
           var newIndex = getIndex(prevId);
           var item = new AngularFireItem(data, index);
-
+          broadcastChange("item_removed", collection[index]);
           updateChild(index, item);
           if (newIndex !== index) {
             moveChild(index, newIndex, item);
           }
+          broadcastChange("item_added", item);
         });
       });
 
@@ -335,6 +346,7 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
           var newIndex = getIndex(prevId);
           var item = collection[oldIndex];
           moveChild(oldIndex, newIndex, item);
+          broadcastChange("item_moved", item);
         });
       });
 
@@ -667,3 +679,4 @@ angular.module("firebase").factory("angularFireAuth", [
     };
   }
 ]);
+

angularfire.min.js

@@ -30,7 +30,14 @@
     var _url = 'https://angularFireTests.firebaseio-demo.com/chat';
     angular.module("chat", ["firebase"]);
     function Chat($scope, angularFireCollection) {
-      $scope.messages = angularFireCollection(new Firebase(_url).limit(2));
+      
+      function log_item_action(action, item) {
+        $scope.item_log.push( {action: action, from: item.from, content: item.content} );
+      }
+      
+      $scope.item_log = [];
+     
+      $scope.messages = angularFireCollection(new Firebase(_url).limit(2), null, log_item_action);
       $scope.username = 'Guest' + Math.floor(Math.random()*101);
       $scope.addMessage = function() {
         $scope.messages.add({from: $scope.username, content: $scope.message});

tests/test_chat.html

@@ -41,6 +41,14 @@ casper.then(function() {
         params[0], params[1], document.querySelector(".messageBlock")
       );
     }, "Testing if message is in the DOM", [_testName, _testMessage]);
+    this.test.assertEval(function(params) { 
+      var item = _scope.item_log[0];
+      return item.action  === params[0] &&
+             item.from    === params[1] &&
+             item.content === params[2];              
+      },
+      "Testing if callback called", ["item_added", _testName, _testMessage]);
+    
   });
 });
 
@@ -66,6 +74,15 @@ casper.then(function() {
       }
       return testIfInDOM(params[0], params[1], msgs[1]);
     }, "Testing if remote message is in the DOM", [_testName, _testMessage]);
+    
+    this.test.assertEval(function(params) { 
+      var item = _scope.item_log[1];
+      return item.action  === params[0] &&
+             item.from    === params[1] &&
+             item.content === params[2];              
+      },
+      "Testing if callback called", ["item_added", _testName, _testMessage]);
+    
   });
 });
 
@@ -89,7 +106,19 @@ casper.then(function() {
       var msgs = document.querySelectorAll(".messageBlock");
       return msgs.length === 2;
     }, "Testing if limits and queries work");
-  });
+    this.test.assertEval(function() { 
+      var item1 = _scope.item_log[0],
+          item1x = _scope.item_log[2],
+          item3 = _scope.item_log[3];
+      
+      return item1x.action  === 'item_removed' &&
+             item1x.from    === item1.from &&
+             item1x.content === item1.content &&
+             item3.action   === 'item_added' &&
+             item3.content  === "Limit Test";              
+      },
+      "Testing if callback called for limit test");
+ });
 });
 
 casper.run(function() {