Merge pull request #811 from marionettejs/sjs/fix-default-options

retain default options set on a view's constructor

Author: samccone

spec/javascripts/layout.spec.js

@@ -125,7 +125,7 @@ describe("layout", function(){
     });
 
     it("should supply the layout.options to the function when calling it", function(){
-      expect(options).toBe(layout.options);
+      expect(options).toEqual(layout.options);
     });
 
     it("should build the regions from the returns object literal", function(){

spec/javascripts/view.spec.js

@@ -132,6 +132,11 @@ describe("base view", function(){
 
   describe("constructing a view with default options", function(){
     var view = Marionette.ItemView.extend();
+    var presetOptions = Marionette.View.extend({
+      options: {
+        'lila': 'zoidberg'
+      }
+    });
 
     it("should take and store view options", function() {
       var viewInstance = new view({"Guybrush": "Island"});
@@ -142,6 +147,11 @@ describe("base view", function(){
       var viewInstance = new view;
       expect(typeof(viewInstance.options.Guybrush)).toBe("undefined");
     });
+
+    it("should retain options set on view class", function() {
+      var viewInstance = new presetOptions;
+      expect(viewInstance.options.lila).toBe("zoidberg");
+    });
   });
 
   describe("should expose its options in the constructor", function() {

src/marionette.view.js

@@ -13,7 +13,7 @@ Marionette.View = Backbone.View.extend({
     // this is a backfill since backbone removed the assignment
     // of this.options
     // at some point however this may be removed
-    this.options = options || {};
+    this.options = _.extend({}, this.options, options);
 
     // parses out the @ui DSL for events
     this.events = this.normalizeUIKeys(_.result(this, 'events'));