Merge pull request jashkenas#1119 from braddunbar/collection-model

Fix jashkenas#1112 - options.model sets collection.model.
r00k · Mar 19, 2012 · 315d67b · 315d67b
2 parents 01fb414 + 9ffc84c
commit 315d67b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/backbone.js b/backbone.js
@@ -512,6 +512,7 @@
   // its models in sort order, as they're added and removed.
   var Collection = Backbone.Collection = function(models, options) {
     options || (options = {});
+    if (options.model) this.model = options.model;
     if (options.comparator) this.comparator = options.comparator;
     this._reset();
     this.initialize.apply(this, arguments);

diff --git a/test/collection.js b/test/collection.js
@@ -528,4 +528,11 @@ $(document).ready(function() {
     ok(c.get() === undefined);
   });
 
+  test("#1112 - passing options.model sets collection.model", function() {
+    var Model = Backbone.Model.extend({})
+    var c = new Backbone.Collection([{id: 1}], {model: Model});
+    ok(c.model === Model);
+    ok(c.at(0) instanceof Model);
+  });
+
 });