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

2 files changed, 10 insertions, 4 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:
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 60dc2e8bb4..f1b956cf12 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -684,8 +684,11 @@ module ActionView
       # 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.
-      def update_page_tag(&block)
-        javascript_tag update_page(&block)
+      #
+      # +html_options+ may be a hash of <script> 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
 
     protected