Skip to content

Commit b13b49c

Browse files
committed
Merge pull request rails#3718 from lest/fix-javascript-include-tag
javascript_include_tag should add '.js' to sources that contain '.'
2 parents 39ecbfd + aa491f6 commit b13b49c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

actionpack/lib/sprockets/helpers/rails_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def rewrite_asset_path(source, dir, options = {})
154154
end
155155

156156
def rewrite_extension(source, dir, ext)
157-
if ext && File.extname(source).empty?
157+
if ext && File.extname(source) != ".#{ext}"
158158
"#{source}.#{ext}"
159159
else
160160
source

actionpack/test/template/sprockets_helper_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,9 @@ def config
217217
assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js\?body=1" type="text/javascript"></script>\n<script src="/assets/application-[0-9a-f]+.js\?body=1" type="text/javascript"></script>},
218218
javascript_include_tag(:application, :debug => true)
219219

220+
assert_match %r{<script src="/assets/jquery.plugin.js" type="text/javascript"></script>},
221+
javascript_include_tag('jquery.plugin', :digest => false)
222+
220223
@config.assets.compile = true
221224
@config.assets.debug = true
222225
assert_match %r{<script src="/javascripts/application.js" type="text/javascript"></script>},

0 commit comments

Comments
 (0)