aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets/helpers
diff options
context:
space:
mode:
authorSergey Nartimov <just.lest@gmail.com>2012-05-21 15:32:13 +0300
committerSergey Nartimov <just.lest@gmail.com>2012-05-21 15:47:12 +0300
commit39f9f02ab04973b213bef8c6f4c1a71043ed709d (patch)
tree6ba48175e1ff5b72f4b70e4f1051c264afa979ca /actionpack/lib/sprockets/helpers
parent64e12ff109ad934939df317e532647c603f90520 (diff)
downloadrails-39f9f02ab04973b213bef8c6f4c1a71043ed709d.tar.gz
rails-39f9f02ab04973b213bef8c6f4c1a71043ed709d.tar.bz2
rails-39f9f02ab04973b213bef8c6f4c1a71043ed709d.zip
Assets: don't add extension if other given and file exists
We should lookup if asset without appended extension exists. When sprockets are disabled the asset tag helpers incorporate this logic. When sprockets are enabled we should have the same logic. For example, we have style.ext file in app/assets/stylesheets and we use stylesheet_link_tag in the layout. In this case we should have /assets/style.ext instead of /assets/style.ext.css in the output. Closes #6310
Diffstat (limited to 'actionpack/lib/sprockets/helpers')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 4e11221842..8ac137b4b5 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -155,8 +155,13 @@ module Sprockets
end
def rewrite_extension(source, dir, ext)
- if ext && File.extname(source) != ".#{ext}"
- "#{source}.#{ext}"
+ source_ext = File.extname(source)
+ if ext && source_ext != ".#{ext}"
+ if !source_ext.empty? && asset_environment[source]
+ source
+ else
+ "#{source}.#{ext}"
+ end
else
source
end