Make changedAttributes return nested values

This is mostly there. There's a problem with clear() right now.
afeld · Jan 6, 2014 · b1a8a04 · b1a8a04
1 parent b02052a
commit b1a8a04
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/backbone-nested.js b/backbone-nested.js
@@ -10,7 +10,8 @@
 (function(){
   'use strict';
 
-  var _delayedTriggers = [];
+  var _delayedTriggers = [],
+    nestedChanges;
 
   Backbone.NestedModel = Backbone.Model.extend({
 
@@ -65,6 +66,8 @@
         }
       }
 
+      nestedChanges = this.changed;
+
       if (opts.unset && attrPath && attrPath.length === 1){ // assume it is a singular attribute being unset
         // unsetting top-level attribute
         unsetObj = {};
@@ -183,6 +186,11 @@
       return this;
     },
 
+    changedAttributes: function() {
+      var backboneChanged = Backbone.NestedModel.__super__.changedAttributes.call(this);
+      return _.extend({}, nestedChanges, backboneChanged);
+    },
+
     toJSON: function(){
       return Backbone.NestedModel.deepClone(this.attributes);
     },

diff --git a/test/nested-model.js b/test/nested-model.js
@@ -709,7 +709,12 @@ $(document).ready(function() {
             initial: 'L',
             full: 'Limburger'
           }
-        }
+        },
+        'name.middle': {
+          initial: 'L',
+          full: 'Limburger'
+        },
+        'name.middle.full': 'Limburger'
       });
     });
 
@@ -726,7 +731,12 @@ $(document).ready(function() {
             initial: 'L',
             full: 'Limburger'
           }
-        }
+        },
+        'name.middle': {
+          initial: 'L',
+          full: 'Limburger'
+        },
+        'name.middle.full': 'Limburger'
       });
     });
 
@@ -766,7 +776,8 @@ $(document).ready(function() {
             initial: 'L',
             full: 'Lee'
           }
-        }
+        },
+        'name.last': 'Dylan'
       });
     });
 
@@ -791,7 +802,8 @@ $(document).ready(function() {
             initial: 'L',
             full: 'Lee'
           }
-        }
+        },
+        'name.last': 'Dylan'
       });
     });