diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-12-10 18:07:13 -0500 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-12-10 18:08:42 -0500 |
commit | 7a7e87d5aa39e9820ea9e509a3f1477c9dbf369c (patch) | |
tree | 64c86e624cf63959ad7aad5d9437b23206b69c0c | |
parent | cd7fbcbba82c08aeaac791e4d8ff3f789e628b3b (diff) | |
download | rails-7a7e87d5aa39e9820ea9e509a3f1477c9dbf369c.tar.gz rails-7a7e87d5aa39e9820ea9e509a3f1477c9dbf369c.tar.bz2 rails-7a7e87d5aa39e9820ea9e509a3f1477c9dbf369c.zip |
Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes #3333 #3348 #3361.
Is wrong use ProcessedAsset#to_s since it returns the content of the file.
-rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 75ba1e66c2..1bd9d5ca26 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -26,7 +26,7 @@ module Sprockets sources.collect do |source| if debug && asset = asset_paths.asset_for(source, 'js') asset.to_a.map { |dep| - super(dep.to_s, { :src => path_to_asset(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options)) + super(dep.pathname.to_s, { :src => path_to_asset(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options)) } else super(source.to_s, { :src => path_to_asset(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options)) @@ -43,7 +43,7 @@ module Sprockets sources.collect do |source| if debug && asset = asset_paths.asset_for(source, 'css') asset.to_a.map { |dep| - super(dep.to_s, { :href => path_to_asset(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options)) + super(dep.pathname.to_s, { :href => path_to_asset(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options)) } else super(source.to_s, { :href => path_to_asset(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options)) @@ -57,7 +57,7 @@ module Sprockets options[:body] ? "#{path}?body=1" : path end alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route - + def image_path(source) path_to_asset(source) end |