Skip to content

Commit

Permalink
Render full documents for requests with Turbo-Frame: header
Browse files Browse the repository at this point in the history
Re-submission of [#232][]
Related to [hotwired/turbo#1047][]

Render full documents, including default layout rendering behavior.

Rendering a minimal layout forces `turbo:reload` events because of the
severe difference in the contents of the minimal layout's `<head>` and
the requesting document's fully populated `<head>`.

[#232]: #232
[hotwired/turbo#1047]: hotwired/turbo#1047
  • Loading branch information
seanpdoyle committed Feb 21, 2024
1 parent 6a60eb4 commit 98b0854
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
1 change: 0 additions & 1 deletion app/controllers/turbo/frames/frame_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module Turbo::Frames::FrameRequest
extend ActiveSupport::Concern

included do
layout -> { "turbo_rails/frame" if turbo_frame_request? }
etag { :frame if turbo_frame_request? }

helper_method :turbo_frame_request_id
Expand Down
8 changes: 0 additions & 8 deletions app/views/layouts/turbo_rails/frame.html.erb

This file was deleted.

4 changes: 2 additions & 2 deletions test/frames/frame_request_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Turbo::FrameRequestControllerTest < ActionDispatch::IntegrationTest
assert_select "title", count: 1

get tray_path(id: 1), headers: { "Turbo-Frame" => "true" }
assert_select "title", count: 0
assert_select "title", count: 1
end

test "frame request layout includes `head` content" do
Expand All @@ -22,7 +22,7 @@ class Turbo::FrameRequestControllerTest < ActionDispatch::IntegrationTest
end

assert_select "meta[name=test][content=present]"
assert_select "meta[name=alternative][content=present]"
assert_select "meta[name=alternative][content=present]", count: 0
end

test "frame requests get a unique etag" do
Expand Down

0 comments on commit 98b0854

Please sign in to comment.