tweaking duplicate model merge:true

jandas · Apr 23, 2012 · b42cc64 · b42cc64
1 parent 9ee0358
commit b42cc64
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/backbone.js b/backbone.js
@@ -631,10 +631,12 @@
         model.trigger('add', model, this, options);
       }
 
+      // Merge in duplicate models.
       if (options.merge) {
         for (i = 0, length = dups.length; i < length; i++) {
-          model = this._byId[dups[i].id] || this._byCid[dups[i].cid];
-          model.set(dups[i], options);
+          if (model = this._byId[dups[i].id]) {
+            model.set(dups[i], options);
+          }
         }
       }