diff options
Diffstat (limited to 'actionview/lib/action_view/renderer')
3 files changed, 8 insertions, 13 deletions
diff --git a/actionview/lib/action_view/renderer/abstract_renderer.rb b/actionview/lib/action_view/renderer/abstract_renderer.rb index 475452f1bb..b397c02cde 100644 --- a/actionview/lib/action_view/renderer/abstract_renderer.rb +++ b/actionview/lib/action_view/renderer/abstract_renderer.rb @@ -59,11 +59,10 @@ module ActionView end class RenderedTemplate # :nodoc: - attr_reader :body, :layout, :template + attr_reader :body, :template - def initialize(body, layout, template) + def initialize(body, template) @body = body - @layout = layout @template = template end @@ -97,8 +96,8 @@ module ActionView @lookup_context.formats = formats | @lookup_context.formats end - def build_rendered_template(content, template, layout = nil) - RenderedTemplate.new content, layout, template + def build_rendered_template(content, template) + RenderedTemplate.new content, template end def build_rendered_collection(templates, spacer) diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb index ed8d5cf54e..608e417583 100644 --- a/actionview/lib/action_view/renderer/partial_renderer.rb +++ b/actionview/lib/action_view/renderer/partial_renderer.rb @@ -305,7 +305,7 @@ module ActionView else @template_keys = @locals.keys end - template = find_partial(@path, @template_keys) + template = find_template(@path, @template_keys) @variable ||= template.variable else if options[:cached] @@ -364,7 +364,7 @@ module ActionView content = layout.render(view, locals) { content } if layout payload[:cache_hit] = view.view_renderer.cache_hits[template.virtual_path] - build_rendered_template(content, template, layout) + build_rendered_template(content, template) end end @@ -428,10 +428,6 @@ module ActionView @object.to_ary if @object.respond_to?(:to_ary) end - def find_partial(path, template_keys) - find_template(path, template_keys) - end - def find_template(path, locals) prefixes = path.include?(?/) ? [] : @lookup_context.prefixes @lookup_context.find_template(path, prefixes, true, locals, @details) @@ -455,7 +451,7 @@ module ActionView content = template.render(view, locals) content = layout.render(view, locals) { content } if layout partial_iteration.iterate! - build_rendered_template(content, template, layout) + build_rendered_template(content, template) end end diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb index 4aab3f913f..4cd8fc5bb2 100644 --- a/actionview/lib/action_view/renderer/template_renderer.rb +++ b/actionview/lib/action_view/renderer/template_renderer.rb @@ -71,7 +71,7 @@ module ActionView else content end - build_rendered_template(body, template, layout) + build_rendered_template(body, template) end # This is the method which actually finds the layout using details in the lookup |