github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-09 21:55:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Hide InlineTemplate class from ActionController and use ActionView's render API

Browse Source
This commit is contained in:
Joshua Peek
2008-06-25 06:04:06 -05:00
parent ad772402c4
commit a9259ccfe0
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actionpack/lib/action_controller/base.rb
View File

@@ -859,8 +859,7 @@ module ActionController #:nodoc:
elsif inline = options[:inline]
add_variables_to_assigns
tmpl = ActionView::InlineTemplate.new(@template, options[:inline], options[:locals], options[:type])
render_for_text(@template.render_template(tmpl), options[:status])
render_for_text(@template.render(options), options[:status])
elsif action_name = options[:action]
template = default_template_name(action_name.to_s)

11
actionpack/lib/action_view/base.rb
View File

@@ -256,16 +256,11 @@ module ActionView #:nodoc:
elsif options[:partial]
render_partial(options[:partial], ActionView::Base::ObjectWrapper.new(options[:object]), options[:locals])
elsif options[:inline]
template = InlineTemplate.new(self, options[:inline], options[:locals], options[:type])
render_template(template)
render_inline(options[:inline], options[:locals], options[:type])
end
end
end
def render_template(template) #:nodoc:
template.render_template
end
# Returns true is the file may be rendered implicitly.
def file_public?(template_path)#:nodoc:
template_path.split('/').last[0,1] != '_'
@@ -323,6 +318,10 @@ module ActionView #:nodoc:
Template.new(self, template_path, use_full_path, local_assigns).render_template
end
def render_inline(text, local_assigns = {}, type = nil)
InlineTemplate.new(self, text, local_assigns, type).render_template
end
def wrap_content_for_layout(content)
original_content_for_layout, @content_for_layout = @content_for_layout, content
yield