From d0b5f640f2f4ad4f6c42d33300129601210257de Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 10 Dec 2007 09:12:50 +0000 Subject: Fix javascript_tag method name collision. Closes #10337. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8368 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 41d5e0a17a..6aaf147f94 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -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 -- cgit v1.2.3