Merge pull request #546 from jamestalmage/bindto-performance-enhancement

Bindto performance enhancement and fixes.

Author: katowulf

src/FirebaseObject.js

@@ -318,56 +318,47 @@
             self.scope = scope;
             self.varName = varName;
 
-            function equals(rec) {
-              var parsed = getScope();
-              var newData = $firebaseUtils.scopeData(rec);
-              return angular.equals(parsed, newData) &&
-                parsed.$priority === rec.$priority &&
-                parsed.$value === rec.$value;
-            }
-
-            function getScope() {
-              return $firebaseUtils.scopeData(parsed(scope));
+            function equals(scopeValue) {
+              return angular.equals(scopeValue, rec) &&
+                scopeValue.$priority === rec.$priority &&
+                scopeValue.$value === rec.$value;
             }
 
             function setScope(rec) {
               parsed.assign(scope, $firebaseUtils.scopeData(rec));
             }
 
-            var send = $firebaseUtils.debounce(function() {
-              rec.$$scopeUpdated(getScope())
+            var send = $firebaseUtils.debounce(function(val) {
+              rec.$$scopeUpdated($firebaseUtils.scopeData(val))
                 ['finally'](function() { sending = false; });
             }, 50, 500);
 
-            var scopeUpdated = function() {
-              if( !equals(rec) ) {
+            var scopeUpdated = function(newVal) {
+              newVal = newVal[0];
+              if( !equals(newVal) ) {
                 sending = true;
-                send();
+                send(newVal);
               }
             };
 
             var recUpdated = function() {
-              if( !sending && !equals(rec) ) {
+              if( !sending && !equals(parsed(scope)) ) {
                 setScope(rec);
               }
             };
 
             // $watch will not check any vars prefixed with $, so we
             // manually check $priority and $value using this method
-            function checkMetaVars() {
-              var dat = parsed(scope);
-              if( dat.$value !== rec.$value || dat.$priority !== rec.$priority ) {
-                scopeUpdated();
-              }
+            function watchExp(){
+              var obj = parsed(scope);
+              return [obj, obj.$priority, obj.$value];
             }
 
-            self.subs.push(scope.$watch(checkMetaVars));
-
             setScope(rec);
             self.subs.push(scope.$on('$destroy', self.unbind.bind(self)));
 
             // monitor scope for any changes
-            self.subs.push(scope.$watch(varName, scopeUpdated, true));
+            self.subs.push(scope.$watch(watchExp, scopeUpdated, true));
 
             // monitor the object for changes
             self.subs.push(rec.$watch(recUpdated));

tests/unit/FirebaseObject.spec.js

@@ -331,8 +331,7 @@ describe('$FirebaseObject', function() {
         $scope.test.$priority = 999;
       });
       $interval.flush(500);
-      $timeout.flush(); // for $interval
-      $timeout.flush(); // for $watch
+      $timeout.flush();
       expect(spy).toHaveBeenCalledWith(jasmine.objectContaining({'.priority': 999}));
     });
 
@@ -348,11 +347,39 @@ describe('$FirebaseObject', function() {
         $scope.test.$value = 'bar';
       });
       $interval.flush(500);
-      $timeout.flush(); // for $interval
-      $timeout.flush(); // for $watch
+      $timeout.flush();
       expect(spy).toHaveBeenCalledWith(jasmine.objectContaining({'.value': 'bar'}));
     });
 
+    it('should only call $$scopeUpdated once if both metaVars and properties change in the same $digest',function(){
+      var $scope = $rootScope.$new();
+      var fb = new MockFirebase();
+      fb.autoFlush(true);
+      fb.setWithPriority({text:'hello'},3);
+      var $fb = new $firebase(fb);
+      var obj = $fb.$asObject();
+      flushAll();
+      flushAll();
+      obj.$bindTo($scope, 'test');
+      $scope.$apply();
+      expect($scope.test).toEqual({text:'hello', $id: obj.$id, $priority: 3});
+      var callCount = 0;
+      var old$scopeUpdated = obj.$$scopeUpdated;
+      obj.$$scopeUpdated = function(){
+        callCount++;
+        return old$scopeUpdated.apply(this,arguments);
+      };
+      $scope.$apply(function(){
+        $scope.test.text='goodbye';
+        $scope.test.$priority=4;
+      });
+      flushAll();
+      flushAll();
+      flushAll();
+      flushAll();
+      expect(callCount).toEqual(1);
+    });
+
     it('should throw error if double bound', function() {
       var $scope = $rootScope.$new();
       var aSpy = jasmine.createSpy('firstBind');