Fix same mutation problem with existing/non-existing mix of models

vitrum · May 15, 2013 · 6ac7704 · 6ac7704
1 parent 61987e8
commit 6ac7704
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/backbone.js b/backbone.js
@@ -685,7 +685,6 @@
           if (remove) modelMap[existing.cid] = true;
           if (merge) {
             attrs = attrs === model ? model.attributes : options._attrs;
-            delete options._attrs;
             existing.set(attrs, options);
             if (sortable && !sort && existing.hasChanged(sortAttr)) sort = true;
           }
@@ -701,6 +700,7 @@
           if (model.id != null) this._byId[model.id] = model;
         }
         if (order) order.push(existing || model);
+        delete options._attrs;
       }
 
       // Remove nonexistent models if appropriate.

diff --git a/test/collection.js b/test/collection.js
@@ -981,6 +981,8 @@ $(document).ready(function() {
     equal(collection.first().id, 1);
     collection.set(data);
     equal(collection.first().id, 1);
+    collection.set([{id: 2, child: {id: 2}}].concat(data));
+    deepEqual(collection.pluck('id'), [2, 1]);
   });
 
   test("`set` and model level `parse`", function() {