diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-22 09:45:11 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-22 09:45:11 -0800 |
| commit | b13b49ccc17a04836fdc877094eab4c951e69e66 (patch) | |
| tree | 314d5f6a9d9fcd9b73043454198d13708477cb78 /actionpack/lib | |
| parent | 39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd (diff) | |
| parent | aa491f6a9c90641a2d4115420b14e45514962834 (diff) | |
| download | rails-b13b49ccc17a04836fdc877094eab4c951e69e66.tar.gz rails-b13b49ccc17a04836fdc877094eab4c951e69e66.tar.bz2 rails-b13b49ccc17a04836fdc877094eab4c951e69e66.zip | |
Merge pull request #3718 from lest/fix-javascript-include-tag
javascript_include_tag should add '.js' to sources that contain '.'
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index ddf9b08b54..1ebe7f68f7 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -154,7 +154,7 @@ module Sprockets end def rewrite_extension(source, dir, ext) - if ext && File.extname(source).empty? + if ext && File.extname(source) != ".#{ext}" "#{source}.#{ext}" else source |