diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 483c255085..a5bc36bb22 100644 --- a/actionpack/CHANGELOG +++ b/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] 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 |