diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-08-28 19:00:58 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-08-28 19:00:58 -0500 |
| commit | 381904d26b601c89e2a8496612a7c76db8ae9359 (patch) | |
| tree | 9ecb80e9bf75abdcc77b68a5fe0412dd38eebd21 /actionpack/lib/sprockets | |
| parent | 734792aaaab07cd7b4340b76ae66be3533088b11 (diff) | |
| download | rails-381904d26b601c89e2a8496612a7c76db8ae9359.tar.gz rails-381904d26b601c89e2a8496612a7c76db8ae9359.tar.bz2 rails-381904d26b601c89e2a8496612a7c76db8ae9359.zip | |
Avoid extra recursive call in Sprockets helpers
Diffstat (limited to 'actionpack/lib/sprockets')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 7ad4d30d9e..7a2bf8bef6 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| - javascript_include_tag(dep, options.merge({ :debug => false, :body => true })) + super(dep.to_s, { :src => asset_path(dep, 'js', true) }.merge!(options)) } else super(source.to_s, { :src => asset_path(source, 'js', body) }.merge!(options)) @@ -42,7 +42,7 @@ module Sprockets sources.collect do |source| if debug && asset = asset_paths.asset_for(source, 'css') asset.to_a.map { |dep| - stylesheet_link_tag(dep, options.merge({ :debug => false, :body => true })) + super(dep.to_s, { :href => asset_path(dep, 'css', true, :request) }.merge!(options)) } else super(source.to_s, { :href => asset_path(source, 'css', body, :request) }.merge!(options)) |