aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib
diff options
context:
space:
mode:
authorAbhay Nikam <nikam.abhay1@gmail.com>2019-02-20 18:50:24 +0530
committerAbhay Nikam <nikam.abhay1@gmail.com>2019-03-09 11:54:42 +0530
commit1de6a20a6dd68a89cc768fc48e920157a1c83a90 (patch)
tree152a55f7ea5a875e74ee67d4f09374bbbc7354a0 /actionview/lib
parent0771bd3ee891f8eaf822bb47f68f4d0266763728 (diff)
downloadrails-1de6a20a6dd68a89cc768fc48e920157a1c83a90.tar.gz
rails-1de6a20a6dd68a89cc768fc48e920157a1c83a90.tar.bz2
rails-1de6a20a6dd68a89cc768fc48e920157a1c83a90.zip
Removed unused layout attribute from RenderedTemplate
Diffstat (limited to 'actionview/lib')
-rw-r--r--actionview/lib/action_view/renderer/abstract_renderer.rb9
-rw-r--r--actionview/lib/action_view/renderer/partial_renderer.rb4
-rw-r--r--actionview/lib/action_view/renderer/template_renderer.rb2
3 files changed, 7 insertions, 8 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..dc85750a22 100644
--- a/actionview/lib/action_view/renderer/partial_renderer.rb
+++ b/actionview/lib/action_view/renderer/partial_renderer.rb
@@ -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
@@ -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, 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 83b990b081..095c7fbe4e 100644
--- a/actionview/lib/action_view/renderer/template_renderer.rb
+++ b/actionview/lib/action_view/renderer/template_renderer.rb
@@ -66,7 +66,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