提交 3644415a 编写于 作者: T Tobias Lütke

Cached versions of concatted js/css asset tags have to be written out atomically.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6351 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 dbf42e37
......@@ -147,9 +147,9 @@ def javascript_include_tag(*sources)
joined_javascript_path = File.join(JAVASCRIPTS_DIR, joined_javascript_name)
if !File.exists?(joined_javascript_path)
File.open(joined_javascript_path, "w+") do |cache|
File.atomic_write(joined_javascript_path, File.dirname(joined_javascript_path)) do |cache|
javascript_paths = expand_javascript_sources(sources).collect do |source|
compute_public_path(source, 'javascripts', 'js', false)
compute_public_path(source, 'javascripts', 'js')
end
cache.write(join_asset_file_contents(javascript_paths))
......@@ -242,9 +242,9 @@ def stylesheet_link_tag(*sources)
joined_stylesheet_path = File.join(STYLESHEETS_DIR, joined_stylesheet_name)
if !File.exists?(joined_stylesheet_path)
File.open(joined_stylesheet_path, "w+") do |cache|
File.atomic_write(joined_stylesheet_path, File.dirname(joined_stylesheet_path)) do |cache|
stylesheet_paths = expand_stylesheet_sources(sources).collect do |source|
compute_public_path(source, 'stylesheets', 'css', false)
compute_public_path(source, 'stylesheets', 'css')
end
cache.write(join_asset_file_contents(stylesheet_paths))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册