Skip to content

Commit

Permalink
Wrap all occurences of <script> in a <tt> tag in docs [#5537 state:co…
Browse files Browse the repository at this point in the history
…mmitted]
  • Loading branch information
David Trasbo committed Sep 6, 2010
1 parent 32157a2 commit cfc8c7a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion actionpack/lib/action_view/helpers/javascript_helper.rb
Expand Up @@ -65,7 +65,8 @@ def escape_javascript(javascript)
# //]]>
# </script>
#
# +html_options+ may be a hash of attributes for the <script> tag. Example:
# +html_options+ may be a hash of attributes for the <tt><script></tt>
# tag. Example:
# javascript_tag "alert('All is good')", :defer => 'defer'
# # => <script defer="defer" type="text/javascript">alert('All is good')</script>
#
Expand Down
16 changes: 8 additions & 8 deletions actionpack/lib/action_view/helpers/prototype_helper.rb
Expand Up @@ -161,8 +161,8 @@ def include_helpers_from_context

# JavaScriptGenerator generates blocks of JavaScript code that allow you
# to change the content and presentation of multiple DOM elements. Use
# this in your Ajax response bodies, either in a <script> tag or as plain
# JavaScript sent with a Content-type of "text/javascript".
# this in your Ajax response bodies, either in a <tt><script></tt> tag
# or as plain JavaScript sent with a Content-type of "text/javascript".
#
# Create new instances with PrototypeHelper#update_page or with
# ActionController::Base#render, then call +insert_html+, +replace_html+,
Expand Down Expand Up @@ -224,7 +224,7 @@ def include_helpers_from_context
#
# You can also use PrototypeHelper#update_page_tag instead of
# PrototypeHelper#update_page to wrap the generated JavaScript in a
# <script> tag.
# <tt><script></tt> tag.
module GeneratorMethods
def to_s #:nodoc:
(@lines * $/).tap do |javascript|
Expand Down Expand Up @@ -582,12 +582,12 @@ def update_page(&block)
JavaScriptGenerator.new(self, &block).to_s.html_safe
end

# Works like update_page but wraps the generated JavaScript in a <script>
# tag. Use this to include generated JavaScript in an ERb template.
# See JavaScriptGenerator for more information.
# Works like update_page but wraps the generated JavaScript in a
# <tt><script></tt> tag. Use this to include generated JavaScript in an
# ERb template. See JavaScriptGenerator for more information.
#
# +html_options+ may be a hash of <script> attributes to be passed
# to ActionView::Helpers::JavaScriptHelper#javascript_tag.
# +html_options+ may be a hash of <tt><script></tt> attributes to be
# passed to ActionView::Helpers::JavaScriptHelper#javascript_tag.
def update_page_tag(html_options = {}, &block)
javascript_tag update_page(&block), html_options
end
Expand Down

0 comments on commit cfc8c7a

Please sign in to comment.