aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/javascript_helper.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-10-09 00:50:11 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-10-09 00:50:11 +0000
commit8ff92e243568a6ae72e88f48a7ae15dffaf81e57 (patch)
tree5c2a0faa2d36a819733b71ca3f0a8565ac12a90e /actionpack/lib/action_view/helpers/javascript_helper.rb
parentca35e264a43790ec96306388cbe0a078a5c355eb (diff)
downloadrails-8ff92e243568a6ae72e88f48a7ae15dffaf81e57.tar.gz
rails-8ff92e243568a6ae72e88f48a7ae15dffaf81e57.tar.bz2
rails-8ff92e243568a6ae72e88f48a7ae15dffaf81e57.zip
Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 [tzaharia]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5245 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/javascript_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/javascript_helper.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 039a2f1810..7bce6b91eb 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -162,8 +162,11 @@ module ActionView
# alert('All is good')
# //]]>
# </script>
- def javascript_tag(content)
- content_tag("script", javascript_cdata_section(content), :type => "text/javascript")
+ #
+ # +html_options+ may be a hash of attributes for the <script> tag. Example:
+ # javascript_tag "alert('All is good')", :defer => 'true' # => <script defer="true" type="text/javascript">alert('All is good')</script>
+ def javascript_tag(content, html_options = {})
+ content_tag("script", javascript_cdata_section(content), html_options.merge(:type => "text/javascript"))
end
def javascript_cdata_section(content) #:nodoc: