github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some more AV refactoring:

Browse Source 
* remove no longer used _array_like_objects
  * _render_content_with_layout renamed to _render_content since layout it optional
  * remove check for optional layout before _render_content
This commit is contained in:
Yehuda Katz
2009-08-07 02:46:21 -03:00
parent 8534c5bf19
commit b3e199f698
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
actionpack/lib/action_view/render/partials.rb
View File

@@ -229,19 +229,10 @@ module ActionView
def _render_partial_with_layout(layout, options)
if layout
prefix = controller && !layout.include?("/") ? controller.controller_path : nil
prefix = layout.include?(?/) ? nil : controller_path
layout = find_by_parts(layout, {:formats => formats}, prefix, true)
end
content = _render_partial(options)
return _render_content_with_layout(content, layout, options[:locals])
end
def _array_like_objects
array_like = [Array]
if defined?(ActiveRecord)
array_like.push(ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope)
end
array_like
_render_content(_render_partial(options), layout, options[:locals])
end
def _render_partial_object(template, options)

8
actionpack/lib/action_view/render/rendering.rb
View File

@@ -40,7 +40,7 @@ module ActionView
end
end
def _render_content_with_layout(content, layout, locals)
def _render_content(content, layout, locals)
return content unless layout
locals ||= {}
@@ -116,11 +116,11 @@ module ActionView
handler = Template.handler_class_for_extension(options[:type] || "erb")
template = Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
content = _render_template(template, options[:locals] || {})
layout ? _render_content_with_layout(content, layout, options[:locals]) : content
layout ? _render_content(content, layout, options[:locals]) : content
end
def _render_text(text, layout, options)
layout ? _render_content_with_layout(text, layout, options[:locals]) : text
layout ? _render_content(text, layout, options[:locals]) : text
end
# This is the API to render a ViewContext's template from a controller.
@@ -146,7 +146,7 @@ module ActionView
_render_template(template, locals)
end
layout ? _render_content_with_layout(content, layout, locals) : content
_render_content(content, layout, locals)
end
end
end