aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-28 03:19:27 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-28 03:19:27 +0000
commitdfd953ea962675fdfd397a1e75c04b0536ff3c65 (patch)
tree97353b0ff6347f349cf9546c2fda450c5140ae83 /actionpack/lib/action_view
parentfed7d334f2904afc0955a6496859a8779f3d965e (diff)
downloadrails-dfd953ea962675fdfd397a1e75c04b0536ff3c65.tar.gz
rails-dfd953ea962675fdfd397a1e75c04b0536ff3c65.tar.bz2
rails-dfd953ea962675fdfd397a1e75c04b0536ff3c65.zip
Fixed docs
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4079 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/base.rb8
-rw-r--r--actionpack/lib/action_view/compiled_templates.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index e8facbc360..3e73159d26 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -221,7 +221,7 @@ module ActionView #:nodoc:
# Renders the template present at <tt>template_path</tt>. If <tt>use_full_path</tt> is set to true,
# it's relative to the template_root, otherwise it's absolute. The hash in <tt>local_assigns</tt>
# is made available as local variables.
- def render_file(template_path, use_full_path = true, local_assigns = {})
+ def render_file(template_path, use_full_path = true, local_assigns = {}) #:nodoc:
@first_render ||= template_path
if use_full_path
@@ -254,7 +254,7 @@ module ActionView #:nodoc:
# Renders the template present at <tt>template_path</tt> (relative to the template_root).
# The hash in <tt>local_assigns</tt> is made available as local variables.
- def render(options = {}, old_local_assigns = {}, &block)
+ def render(options = {}, old_local_assigns = {}, &block) #:nodoc:
if options.is_a?(String)
render_file(options, true, old_local_assigns)
elsif options == :update
@@ -277,7 +277,7 @@ module ActionView #:nodoc:
# Renders the +template+ which is given as a string as either rhtml or rxml depending on <tt>template_extension</tt>.
# The hash in <tt>local_assigns</tt> is made available as local variables.
- def render_template(template_extension, template, file_path = nil, local_assigns = {})
+ def render_template(template_extension, template, file_path = nil, local_assigns = {}) #:nodoc:
if handler = @@template_handlers[template_extension]
template ||= read_template_file(file_path, template_extension) # Make sure that a lazyily-read template is loaded.
delegate_render(handler, template, local_assigns)
@@ -293,7 +293,7 @@ module ActionView #:nodoc:
# Either, but not both, of template and file_path may be nil. If file_path is given, the template
# will only be read if it has to be compiled.
#
- def compile_and_render_template(extension, template = nil, file_path = nil, local_assigns = {})
+ def compile_and_render_template(extension, template = nil, file_path = nil, local_assigns = {}) #:nodoc:
# compile the given template, if necessary
if compile_template?(template, file_path, local_assigns)
template ||= read_template_file(file_path, extension)
diff --git a/actionpack/lib/action_view/compiled_templates.rb b/actionpack/lib/action_view/compiled_templates.rb
index 9488432ba2..a00a7578bb 100644
--- a/actionpack/lib/action_view/compiled_templates.rb
+++ b/actionpack/lib/action_view/compiled_templates.rb
@@ -10,7 +10,7 @@ module ActionView
#
# To use a compiled template module, create a new instance and include it into the class
# in which you want the template to be rendered.
- class CompiledTemplates < Module
+ class CompiledTemplates < Module #:nodoc:
attr_reader :method_names
def initialize