diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-01 12:16:31 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-01 13:40:12 +0200 |
| commit | 33cc001f9158463389a9c9c321de0dbdccb1df8d (patch) | |
| tree | 04b804f786fd8a982926bb2d1d9a1882cc6b19da /actionpack/lib/action_view/renderer | |
| parent | 2f683fd870d0e4c5aff38510ef03c7e5144a1ea4 (diff) | |
| download | rails-33cc001f9158463389a9c9c321de0dbdccb1df8d.tar.gz rails-33cc001f9158463389a9c9c321de0dbdccb1df8d.tar.bz2 rails-33cc001f9158463389a9c9c321de0dbdccb1df8d.zip | |
More cleanup and moving responsibilities around.
Diffstat (limited to 'actionpack/lib/action_view/renderer')
| -rw-r--r-- | actionpack/lib/action_view/renderer/streaming_template_renderer.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb index 03aab444f8..d60b42a284 100644 --- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb +++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb @@ -106,7 +106,7 @@ module ActionView # Set the view flow to support streaming. It will be aware # when to stop rendering the layout because it needs to search # something in the template and vice-versa. - view._view_flow = StreamingFlow.new(view, fiber) + view.view_flow = StreamingFlow.new(view, fiber) # Yo! Start the fiber! fiber.resume @@ -118,7 +118,7 @@ module ActionView content = template.render(view, locals, &yielder) # Once rendering the template is done, sets its content in the :layout key. - view._view_flow.set(:layout, content) + view.view_flow.set(:layout, content) # In case the layout continues yielding, we need to resume # the fiber until all yields are handled. diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index 6b5ead463f..471428ac9e 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -46,7 +46,7 @@ module ActionView if layout view = @view - view._view_flow.set(:layout, content) + view.view_flow.set(:layout, content) layout.render(view, locals){ |*name| view._layout_for(*name) } else content |