Merge pull request jashkenas#2426 from gsamokovarov/no-url-no-urlroot

Don't accept urlRoot from Model and url from Collection

backbone.js

@@ -248,7 +248,7 @@
     options || (options = {});
     this.cid = _.uniqueId('c');
     this.attributes = {};
-    _.extend(this, _.pick(options, modelOptions));
+    if (options.collection) this.collection = options.collection;
     if (options.parse) attrs = this.parse(attrs, options) || {};
     if (defaults = _.result(this, 'defaults')) {
       attrs = _.defaults({}, attrs, defaults);
@@ -258,9 +258,6 @@
     this.initialize.apply(this, arguments);
   };
 
-  // A list of options to be attached directly to the model, if provided.
-  var modelOptions = ['urlRoot', 'collection'];
-
   // Attach all inheritable methods to the Model prototype.
   _.extend(Model.prototype, Events, {
 
@@ -596,7 +593,6 @@
   // its models in sort order, as they're added and removed.
   var Collection = Backbone.Collection = function(models, options) {
     options || (options = {});
-    if (options.url) this.url = options.url;
     if (options.model) this.model = options.model;
     if (options.comparator !== void 0) this.comparator = options.comparator;
     this._reset();

index.html

@@ -987,11 +987,6 @@ <h2 id="Model">Backbone.Model</h2>
       otherwise added automatically when you first add a model to a collection.
     </p>
 
-    <p>
-      <tt>{urlRoot: "..."}</tt> option may be passed when creating a new model
-      that needs to have a custom one-off URL endpoint.
-    </p>
-
     <p>
       If <tt>{parse: true}</tt> is passed as an <b>option</b>, the <b>attributes</b>
       will first be converted by <a href="#Model-parse">parse</a> before being
@@ -1609,8 +1604,8 @@ <h2 id="Collection">Backbone.Collection</h2>
       may be included as an option. Passing <tt>false</tt> as the
       comparator option will prevent sorting. If you define an
       <b>initialize</b> function, it will be invoked when the collection is
-      created. There are several options that, if provided, are attached to the
-      collection directly: <tt>url</tt>, <tt>model</tt> and <tt>comparator</tt>.
+      created. There are a couple of options that, if provided, are attached to
+      the collection directly: <tt>model</tt> and <tt>comparator</tt>.
     </p>
 
 <pre>

test/collection.js

@@ -1081,18 +1081,15 @@ $(document).ready(function() {
     collection.add(collection.models, {merge: true}); // don't sort
   });
 
-  test("Attach options to collection.", 3, function() {
-      var url = '/somewhere';
+  test("Attach options to collection.", 2, function() {
       var model = new Backbone.Model;
       var comparator = function(){};
 
       var collection = new Backbone.Collection([], {
-        url: url,
         model: model,
         comparator: comparator
       });
 
-      strictEqual(collection.url, url);
       ok(collection.model === model);
       ok(collection.comparator === comparator);
   });

test/model.js

@@ -111,11 +111,6 @@ $(document).ready(function() {
     equal(model.url(), '/nested/1/collection/2');
   });
 
-  test('urlRoot is directly attached if passed in the options', 1, function () {
-    var model = new Backbone.Model({a: 2}, {urlRoot: '/test'});
-    equal(model.urlRoot, '/test');
-  });
-
   test("underscore methods", 5, function() {
     var model = new Backbone.Model({ 'foo': 'a', 'bar': 'b', 'baz': 'c' });
     var model2 = model.clone();