fixed bug that prevented default regionType from being used. fixes #674

marionettejs · Aug 14, 2013 · 888be67 · 888be67
1 parent d1bbf70
commit 888be67
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -7,6 +7,7 @@
 * Layout
   * Will properly attach regions if the layout's `close` method was called prior to `render`
   * Calling `.addRegions` will correctly modify the layout instance' region list instead of the prototype's
+  * Fixed bug that prevented default `regionType` from being used
 
 * CompositeView
   * The `itemViewContainer` can be supplied in the constructor function options

diff --git a/spec/javascripts/layout.spec.js b/spec/javascripts/layout.spec.js
@@ -83,25 +83,26 @@ describe("layout", function(){
       layoutManager = new LayoutCustomRegion 
     });
 
-    it("should instantiate the default regionManager if specified", function() {
-      expect(layoutManager).toHaveOwnProperty("regionThree");
-      expect(layoutManager.regionThree).toBeInstanceOf(Marionette.Region);
-      expect(layoutManager).toHaveOwnProperty("regionThree");
-      expect(layoutManager.regionThree).toBeInstanceOf(Marionette.Region);
-    });
-
     it("should instantiate specific regions with custom regions if speficied", function() {
       expect(layoutManager).toHaveOwnProperty("regionOne");
       expect(layoutManager.regionOne).toBeInstanceOf(CustomRegion1);
       expect(layoutManager).toHaveOwnProperty("regionTwo");
       expect(layoutManager.regionTwo).toBeInstanceOf(CustomRegion2);
     });
 
+    it("should instantiate the default regionManager if specified", function() {
+      expect(layoutManager).toHaveOwnProperty("regionThree");
+      expect(layoutManager.regionThree).toBeInstanceOf(CustomRegion1);
+      expect(layoutManager).toHaveOwnProperty("regionFour");
+      expect(layoutManager.regionThree).toBeInstanceOf(CustomRegion1);
+    });
+
     it("should instantiate marionette regions is no regionType is specified", function() {
       var layoutManagerNoDefault = new LayoutNoDefaultRegion();
       expect(layoutManagerNoDefault).toHaveOwnProperty("regionTwo");
       expect(layoutManagerNoDefault.regionTwo).toBeInstanceOf(Backbone.Marionette.Region);
     });
+
   });
 
   describe("when regions are defined as a function", function(){

diff --git a/src/marionette.layout.js b/src/marionette.layout.js
@@ -60,7 +60,7 @@ Marionette.Layout = Marionette.ItemView.extend({
   addRegion: function(name, definition){
     var regions = {};
     regions[name] = definition;
-    return this.addRegions(regions)[name];
+    return this._buildRegions(regions)[name];
   },
 
   // Add multiple regions as a {name: definition, name2: def2} object literal
@@ -80,6 +80,7 @@ Marionette.Layout = Marionette.ItemView.extend({
     var that = this;
 
     var defaults = {
+      regionType: Marionette.getOption(this, "regionType"),
       parentEl: function(){ return that.$el; }
     };
 

diff --git a/src/marionette.region.js b/src/marionette.region.js
@@ -42,6 +42,7 @@ _.extend(Marionette.Region, {
   // ```
   //
   buildRegion: function(regionConfig, defaultRegionType){
+
     var regionIsString = (typeof regionConfig === "string");
     var regionSelectorIsString = (typeof regionConfig.selector === "string");
     var regionTypeIsUndefined = (typeof regionConfig.regionType === "undefined");