added support for Backbone.Model for leaf nodes - issue dhruvaray#124

jtakalai · Mar 22, 2014 · 799a224 · 799a224
1 parent 455653b
commit 799a224
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/backbone-associations.js b/backbone-associations.js
@@ -203,7 +203,7 @@
                     var pathTokens = getPathArray(attr), initials = _.initial(pathTokens),
                         last = pathTokens[pathTokens.length - 1],
                         parentModel = this.get(initials);
-                    if (parentModel instanceof AssociatedModel) {
+                    if (parentModel instanceof BackboneModel) {
                         obj = modelMap[parentModel.cid] ||
                             (modelMap[parentModel.cid] = {'model': parentModel, 'data': {}});
                         obj.data[last] = attributes[attr];
@@ -293,7 +293,7 @@
 
                         } else if (relation.type === Backbone.One) {
 
-                            data = val instanceof AssociatedModel ? val : new relatedModel(val, relationOptions);
+                            data = val instanceof BackboneModel ? val : new relatedModel(val, relationOptions);
 
                             //Is the passed in data for the same key?
                             if (currVal && data.attributes.hasOwnProperty(idKey) &&
@@ -302,7 +302,7 @@
                                 // will not get events until the entire object graph is updated.
                                 currVal._deferEvents = true;
                                 // Perform the traditional `set` operation
-                                currVal._set(val instanceof AssociatedModel ? val.attributes : val, relationOptions);
+                                currVal._set(val instanceof BackboneModel ? val.attributes : val, relationOptions);
                                 data = currVal;
                             } else {
                                 newCtx = true;

diff --git a/test/associated-model.js b/test/associated-model.js
@@ -1696,7 +1696,7 @@ $(document).ready(function () {
 
     });
 
-    test("Issue #124", 4, function () {
+    test("Issue #124", 7, function () {
 
         Backbone.AssociatedModel = Backbone.Model;
         Backbone.Model = Backbone.OriginalModel;
@@ -1726,6 +1726,18 @@ $(document).ready(function () {
         equal(parent.get('myChild') instanceof Backbone.Model, true);
         equal(parent.get('myChild') instanceof Backbone.AssociatedModel, false);
 
+        parent.on('change:myChild', function () {
+            ok('came here')
+        });
+        parent.on('change:myChild.someValue', function () {
+            ok('came here')
+        });
+
+        //equivalent to parent.get('myChild').set('someValue',6);
+        parent.set('myChild.someValue', 6);
+        equal(parent.get('myChild.someValue'), 6);
+
+
     });