Merge pull request #390 from firebase/release_0.8.1_defaults

Release 0.8.1 defaults

Author: Jacob Wenger

dist/angularfire.js

@@ -1723,6 +1723,14 @@ if ( typeof Object.getPrototypeOf !== "function" ) {
             angular.extend(rec, data);
             rec.$priority = snap.getPriority();
 
+            if( angular.isObject(rec.$$defaults) ) {
+              angular.forEach(rec.$$defaults, function(v,k) {
+                if( !rec.hasOwnProperty(k) ) {
+                  rec[k] = v;
+                }
+              });
+            }
+
             return !angular.equals(oldData, rec) ||
               oldData.$value !== rec.$value ||
               oldData.$priority !== rec.$priority;

dist/angularfire.min.js

@@ -214,6 +214,14 @@
             angular.extend(rec, data);
             rec.$priority = snap.getPriority();
 
+            if( angular.isObject(rec.$$defaults) ) {
+              angular.forEach(rec.$$defaults, function(v,k) {
+                if( !rec.hasOwnProperty(k) ) {
+                  rec[k] = v;
+                }
+              });
+            }
+
             return !angular.equals(oldData, rec) ||
               oldData.$value !== rec.$value ||
               oldData.$priority !== rec.$priority;

src/utils.js

@@ -62,12 +62,11 @@ describe('$firebaseUtils', function () {
       expect($utils.updateRec(rec, testutils.snap({foo: 'bar'}, 'foo'))).toBe(false);
     });
 
-    // save this for the next PR
-    xit('should add $$defaults if they exist', function() {
+    it('should add $$defaults if they exist', function() {
       var rec = { foo: 'bar' };
-      rec.$$defaults = { foo: 'not_applied', bar: 'foo' };
+      rec.$$defaults = { baz: 'not_applied', bar: 'foo' };
       $utils.updateRec(rec, testutils.snap({baz: 'bar'}));
-      expect(rec).toEqual(jasmine.objectContaining({foo: 'bar', bar: 'foo', baz: 'bar', $$defaults: { foo: 'not_applied', bar: 'foo' }}));
+      expect(rec).toEqual(jasmine.objectContaining({bar: 'foo', baz: 'bar'}));
     });
 
     it('should apply changes to record', function() {