aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-03-28 13:54:58 -0500
committerJoshua Peek <josh@joshpeek.com>2011-03-28 13:54:58 -0500
commit41cc6430650d0e90e892e0bd9a29ddcefd8a9c64 (patch)
tree99373e672f98109e9a4cf6fa1d7be41d6c170e9b /actionpack/lib/action_view/helpers
parent8ceec5c6c27fab782732834f088eff4cb0ac73f3 (diff)
downloadrails-41cc6430650d0e90e892e0bd9a29ddcefd8a9c64.tar.gz
rails-41cc6430650d0e90e892e0bd9a29ddcefd8a9c64.tar.bz2
rails-41cc6430650d0e90e892e0bd9a29ddcefd8a9c64.zip
Remove sprockets exception from main asset helpers
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb10
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb10
2 files changed, 0 insertions, 20 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 2187887b49..82bbfcc7d2 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
@@ -173,16 +173,6 @@ module ActionView
#
# javascript_include_tag :all, :cache => true, :recursive => true
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.include_tag(*sources)
end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index b9f49f37b4..a48c87b49a 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -136,16 +136,6 @@ module ActionView
# stylesheet_link_tag :all, :concat => true
#
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.include_tag(*sources)
end