github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-04 03:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix javascript_tag method name collision. Closes #10337.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8368 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2007-12-10 09:12:50 +00:00
parent 4b055a4a6a
commit d0b5f640f2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -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]

6
actionpack/lib/action_view/helpers/asset_tag_helper.rb
View File

@@ -202,9 +202,9 @@ module ActionView
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 @@ module ActionView
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