Remove sprockets exception from main asset helpers
This commit is contained in:
parent
8ceec5c6c2
commit
41cc643065
@ -173,16 +173,6 @@ def javascript_path(source)
|
|||||||
#
|
#
|
||||||
# javascript_include_tag :all, :cache => true, :recursive => true
|
# javascript_include_tag :all, :cache => true, :recursive => true
|
||||||
def javascript_include_tag(*sources)
|
def javascript_include_tag(*sources)
|
||||||
if config.perform_caching
|
|
||||||
sources = sources.map do |source|
|
|
||||||
if source =~ /^\/assets\/(.+)/
|
|
||||||
"/assets/#{Rails.application.assets.url($1)}"
|
|
||||||
else
|
|
||||||
source
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
@javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
|
@javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
|
||||||
@javascript_include.include_tag(*sources)
|
@javascript_include.include_tag(*sources)
|
||||||
end
|
end
|
||||||
|
@ -136,16 +136,6 @@ def stylesheet_path(source)
|
|||||||
# stylesheet_link_tag :all, :concat => true
|
# stylesheet_link_tag :all, :concat => true
|
||||||
#
|
#
|
||||||
def stylesheet_link_tag(*sources)
|
def stylesheet_link_tag(*sources)
|
||||||
if config.perform_caching
|
|
||||||
sources = sources.map do |source|
|
|
||||||
if source =~ /^\/assets\/(.+)/
|
|
||||||
"/assets/#{Rails.application.assets.url($1)}"
|
|
||||||
else
|
|
||||||
source
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
@stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
|
@stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
|
||||||
@stylesheet_include.include_tag(*sources)
|
@stylesheet_include.include_tag(*sources)
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user