Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix javascript_tag method name collision. Closes #10337.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8368 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit d0b5f640f2f4ad4f6c42d33300129601210257de 1 parent 4b055a4
@jeremy jeremy authored
View
2  actionpack/CHANGELOG
@@ -1,6 +1,6 @@
*SVN*
-* Ensure asset cache directories are automatically created. #10337 [Josh Peek]
+* Ensure asset cache directories are automatically created. #10337 [Josh Peek, Chu Yeow]
* render :xml and :json preserve custom content types. #10388 [jmettraux, Chu Yeow]
View
6 actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -202,9 +202,9 @@ def javascript_include_tag(*sources)
joined_javascript_path = File.join(JAVASCRIPTS_DIR, joined_javascript_name)
write_asset_file_contents(joined_javascript_path, compute_javascript_paths(sources))
- javascript_tag(joined_javascript_name, options)
+ javascript_src_tag(joined_javascript_name, options)
else
- expand_javascript_sources(sources).collect { |source| javascript_tag(source, options) }.join("\n")
+ expand_javascript_sources(sources).collect { |source| javascript_src_tag(source, options) }.join("\n")
end
end
@@ -461,7 +461,7 @@ def rewrite_asset_path!(source)
source << "?#{asset_id}" if !asset_id.blank?
end
- def javascript_tag(source, options)
+ def javascript_src_tag(source, options)
content_tag("script", "", { "type" => Mime::JS, "src" => path_to_javascript(source) }.merge(options))
end
Please sign in to comment.
Something went wrong with that request. Please try again.