fix creation of layout_opts

leafo · Feb 15, 2023 · fef6bcd · fef6bcd
1 parent e8482f9
commit fef6bcd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lapis/request.lua b/lapis/request.lua
@@ -228,9 +228,11 @@ do
         end
       end
       if self.options.layout == nil then
-        self.layout_opts = { }
         self.options.layout = self.app.layout
       end
+      if self.options.layout then
+        self.layout_opts = { }
+      end
       local widget_cls = self.options.render
       if widget_cls == true then
         widget_cls = self.route_name

diff --git a/lapis/request.moon b/lapis/request.moon
@@ -105,13 +105,14 @@ class Request
 
       -- set default layout if none is specified
       if @options.layout == nil
+        @options.layout = @app.layout
+
+      if @options.layout
         -- NOTE: @layout_opts is a legacy undocumented field, it should be eventually
         -- be removed now that @options can communicate the layout being used
         -- during view rendering
         @layout_opts = {}
 
-        @options.layout = @app.layout
-
       widget_cls = @options.render
       widget_cls = @route_name if widget_cls == true