github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2724 from guilleiguaran/avoid-recursive-call-sprockets-helper

Browse Source 
Avoid extra recursive call in Sprockets helpers
This commit is contained in:
Santiago Pastorino
2011-08-28 17:05:49 -07:00
parent 734792aaaa 381904d26b
commit cfe7548aef
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/sprockets/helpers/rails_helper.rb
View File

@@ -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))