Merge remote-tracking branch 'recurse/patch-2' into dev

spec/javascripts/layout.spec.js

@@ -293,4 +293,21 @@ describe("layout", function(){
     });
   });
 
+  describe("when rendering a prematurely closed layout", function(){
+    var region, layout;
+
+    beforeEach(function(){
+      loadFixtures("layoutManagerTemplate.html");
+
+      layout = new Layout();
+      layout.close();
+      layout.render();
+    });
+
+    it("should re-initialize the regions to the newly rendered elements", function(){
+      expect(layout).toHaveOwnProperty("regionOne");
+      expect(layout).toHaveOwnProperty("regionTwo");
+    });
+  });
+
 });

src/marionette.layout.js

@@ -27,15 +27,16 @@ Marionette.Layout = Marionette.ItemView.extend({
   // for the regions to the newly rendered DOM elements.
   render: function(){
 
-    if (this._firstRender){
-      // if this is the first render, don't do anything to
-      // reset the regions
-      this._firstRender = false;
-    } else if (this.isClosed){
+    if (this.isClosed){
       // a previously closed layout means we need to 
       // completely re-initialize the regions
       this._initializeRegions();
-    } else {
+    }
+    if (this._firstRender) {
+      // if this is the first render, don't do anything to
+      // reset the regions
+      this._firstRender = false;
+    } else if (!this.isClosed){
       // If this is not the first render call, then we need to 
       // re-initializing the `el` for each region
       this._reInitializeRegions();