merge mkelley's urlBase, renamed to urlRoot.

airhorns · Dec 10, 2010 · e8be47f · e8be47f
1 parent 03aa12a
commit e8be47f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/backbone.js b/backbone.js
@@ -291,7 +291,7 @@
     // using Backbone's restful methods, override this to change the endpoint
     // that will be called.
     url : function() {
-      var base = this.urlBase || getUrl(this.collection);
+      var base = this.urlRoot || getUrl(this.collection);
       if (this.isNew()) return base;
       return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + this.id;
     },

diff --git a/test/model.js b/test/model.js
@@ -65,10 +65,10 @@ $(document).ready(function() {
     equals(failed, true);
     doc.collection = collection;
   });
-  
-  test("Model: url when using urlBase", function() {
+
+  test("Model: url when using urlRoot", function() {
     var Model = Backbone.Model.extend({
-      urlBase: '/collection'
+      urlRoot: '/collection'
     });
     var model = new Model();
     equals(model.url(), '/collection');