From 3f84a814aa1d934fc0e577ff1d69f0e814b9d1c2 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 19 Feb 2019 14:57:29 -0800 Subject: Fix up style --- actionview/lib/action_view/renderer/abstract_renderer.rb | 4 ++-- actionview/lib/action_view/renderer/partial_renderer.rb | 8 ++++---- .../action_view/renderer/partial_renderer/collection_caching.rb | 2 +- actionview/lib/action_view/renderer/template_renderer.rb | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'actionview/lib/action_view/renderer') diff --git a/actionview/lib/action_view/renderer/abstract_renderer.rb b/actionview/lib/action_view/renderer/abstract_renderer.rb index 2a51f2ef99..200dc3e10e 100644 --- a/actionview/lib/action_view/renderer/abstract_renderer.rb +++ b/actionview/lib/action_view/renderer/abstract_renderer.rb @@ -90,12 +90,12 @@ module ActionView @lookup_context.formats = formats | @lookup_context.formats end - def build_rendered_template(content, layout, template) + def build_rendered_template(content, template, layout = nil) RenderedTemplate.new content, layout, template end def build_rendered_collection(templates, spacer) - RenderedCollection.new(templates, spacer) + RenderedCollection.new templates, spacer end end end diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb index f4319b8528..4ae6f635ae 100644 --- a/actionview/lib/action_view/renderer/partial_renderer.rb +++ b/actionview/lib/action_view/renderer/partial_renderer.rb @@ -330,7 +330,7 @@ module ActionView spacer = if @options.key?(:spacer_template) spacer_template = find_template(@options[:spacer_template], @locals.keys) - build_rendered_template(spacer_template.render(view, @locals), nil, spacer_template) + build_rendered_template(spacer_template.render(view, @locals), spacer_template) else RenderedTemplate::EMPTY_SPACER end @@ -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, layout, template) + build_rendered_template(content, template, layout) end end @@ -455,7 +455,7 @@ module ActionView content = template.render(view, locals) content = layout.render(view, locals) { content } if layout partial_iteration.iterate! - build_rendered_template(content, layout, template) + build_rendered_template(content, template, layout) end end @@ -477,7 +477,7 @@ module ActionView template = (cache[path] ||= find_template(path, keys + [as, counter, iteration])) content = template.render(view, locals) partial_iteration.iterate! - build_rendered_template(content, nil, template) + build_rendered_template(content, template) end end diff --git a/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb b/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb index 401391290f..ed59033e27 100644 --- a/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb +++ b/actionview/lib/action_view/renderer/partial_renderer/collection_caching.rb @@ -84,7 +84,7 @@ module ActionView def fetch_or_cache_partial(cached_partials, template, order_by:) order_by.map do |cache_key| if content = cached_partials[cache_key] - build_rendered_template(content, nil, template) + build_rendered_template(content, template) else yield.tap do |rendered_partial| collection_cache.write(cache_key, rendered_partial.body) diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb index 7052fe0961..c17d6182e8 100644 --- a/actionview/lib/action_view/renderer/template_renderer.rb +++ b/actionview/lib/action_view/renderer/template_renderer.rb @@ -61,7 +61,7 @@ module ActionView else content end - build_rendered_template(body, layout, template) + build_rendered_template(body, template, layout) end # This is the method which actually finds the layout using details in the lookup -- cgit v1.2.3