Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed javascript_include_tag to output type instead of language and c…

…onform to XHTML #1018 [Rick Olson]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1081 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit d3a64c04ec31f06c25bf3c33a5bc65f91381c271 1 parent efb55d1
@dhh dhh authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed javascript_include_tag to output type instead of language and conform to XHTML #1018 [Rick Olson]
+
* Added NumberHelper for common string representations like phone number, currency, and percentage #1015 [DeLynn]
* Added pagination for scaffolding (10 items per page) #964 [mortonda@dgrmm.net]
View
8 actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -26,15 +26,15 @@ def auto_discovery_link_tag(type = :rss, options = {})
# Returns a script include tag per source given as argument. Examples:
#
# javascript_include_tag "xmlhr" # =>
- # <script language="JavaScript" type="text/javascript" src="/javascripts/xmlhr.js"></script>
+ # <script type="text/javascript" src="/javascripts/xmlhr.js"></script>
#
# javascript_include_tag "common.javascript", "/elsewhere/cools" # =>
- # <script language="JavaScript" type="text/javascript" src="/javascripts/common.javascript"></script>
- # <script language="JavaScript" type="text/javascript" src="/elsewhere/cools.js"></script>
+ # <script type="text/javascript" src="/javascripts/common.javascript"></script>
+ # <script type="text/javascript" src="/elsewhere/cools.js"></script>
def javascript_include_tag(*sources)
sources.collect { |source|
source = compute_public_path(source, 'javascripts', 'js')
- content_tag("script", "", "language" => "JavaScript", "type" => "text/javascript", "src" => source)
+ content_tag("script", "", "type" => "text/javascript", "src" => source)
}.join("\n")
end
Please sign in to comment.
Something went wrong with that request. Please try again.