aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-07-26 01:00:00 -0300
committerXavier Noria <fxn@hashref.com>2011-08-13 16:22:16 -0700
commit16e3c40426c470458764dfd62841d647c725ff35 (patch)
tree520a41a181da25017bb256e6190591852905053d /actionpack/lib/action_view
parent33ee3898ef0aa06bf21ca588b906c7da80886457 (diff)
downloadrails-16e3c40426c470458764dfd62841d647c725ff35.tar.gz
rails-16e3c40426c470458764dfd62841d647c725ff35.tar.bz2
rails-16e3c40426c470458764dfd62841d647c725ff35.zip
use_sprockets is not used anymore
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index 0f8a63901e..25cc561608 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -83,11 +83,7 @@ module ActionView
# javascript_path "http://www.example.com/js/xmlhr" # => http://www.example.com/js/xmlhr
# javascript_path "http://www.example.com/js/xmlhr.js" # => http://www.example.com/js/xmlhr.js
def javascript_path(source)
- if config.use_sprockets
- asset_path(source, 'js')
- else
- asset_paths.compute_public_path(source, 'javascripts', 'js')
- end
+ asset_paths.compute_public_path(source, 'javascripts', 'js')
end
alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route