Merge pull request #1846 from akre54/extendable-options

Allow View.options to be provided as a function

backbone.js

@@ -1313,7 +1313,7 @@
     // Keys with special meaning *(model, collection, id, className)*, are
     // attached directly to the view.
     _configure: function(options) {
-      if (this.options) options = _.extend({}, this.options, options);
+      if (this.options) options = _.extend({}, _.result(this, 'options'), options);
       _.extend(this, _.pick(options, viewOptions));
       this.options = options;
     },

test/view.js

@@ -165,6 +165,30 @@ $(document).ready(function() {
     strictEqual(new View().el.id, 'id');
   });
 
+  test("with options function", 3, function() {
+    var View1 = Backbone.View.extend({
+      options: function() {
+        return {
+          title: 'title1',
+          acceptText: 'confirm'
+        }
+      }
+    });
+
+    var View2 = View1.extend({
+      options: function() {
+        return _.extend(View1.prototype.options.call(this), {
+          title: 'title2',
+          fixed: true
+        });
+      }
+    });
+
+    strictEqual(new View2().options.title, 'title2');
+    strictEqual(new View2().options.acceptText, 'confirm');
+    strictEqual(new View2().options.fixed, true);
+  });
+
   test("with attributes", 2, function() {
     var View = Backbone.View.extend({
       attributes: {