diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-08 06:56:44 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-04-08 06:56:44 -0700 |
commit | 0032da1b3eefbcb64d39b82e967fa395947278fd (patch) | |
tree | 144f0768c59f7956f5f0ac50bddc1fd7616865af /actionpack/lib/action_view/helpers/javascript_helper.rb | |
parent | d2726a950015d70c5b43ff4c902dfb7651c2dfc0 (diff) | |
parent | f3fb416b89dab8d7b565b174bdc1116a519ab18d (diff) | |
download | rails-0032da1b3eefbcb64d39b82e967fa395947278fd.tar.gz rails-0032da1b3eefbcb64d39b82e967fa395947278fd.tar.bz2 rails-0032da1b3eefbcb64d39b82e967fa395947278fd.zip |
Merge pull request #5748 from ai/no_type_in_html5
Remove unnecessary in HTML 5 type attribute with default value
Diffstat (limited to 'actionpack/lib/action_view/helpers/javascript_helper.rb')
-rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index d88f5babb9..5a869d6303 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -37,7 +37,7 @@ module ActionView # javascript_tag "alert('All is good')" # # Returns: - # <script type="text/javascript"> + # <script> # //<![CDATA[ # alert('All is good') # //]]> @@ -46,7 +46,7 @@ module ActionView # +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> + # # => <script defer="defer">alert('All is good')</script> # # Instead of passing the content as an argument, you can also use a block # in which case, you pass your +html_options+ as the first parameter. @@ -62,7 +62,7 @@ module ActionView content_or_options_with_block end - content_tag(:script, javascript_cdata_section(content), html_options.merge(:type => Mime::JS)) + content_tag(:script, javascript_cdata_section(content), html_options) end def javascript_cdata_section(content) #:nodoc: |