Permalink
Browse files

Remove explicit sprockets usage. This should have come over in the me…

…rge, but for some reason it didn't.
  • Loading branch information...
1 parent 5b300a9 commit de6394208c0660ab9e5ec2d38db8ba80ebe78774 @wycats wycats committed Jun 3, 2011
Showing with 3 additions and 11 deletions.
  1. +3 −11 actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -60,11 +60,7 @@ def register_stylesheet_expansion(expansions)
# stylesheet_path "http://www.example.com/css/style" # => http://www.example.com/css/style
# stylesheet_path "http://www.example.com/css/style.css" # => http://www.example.com/css/style.css
def stylesheet_path(source)
- if config.use_sprockets
- asset_path(source, 'css')
- else
- asset_paths.compute_public_path(source, 'stylesheets', 'css')
- end
+ asset_paths.compute_public_path(source, 'stylesheets', 'css')
end
alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
@@ -137,12 +133,8 @@ def stylesheet_path(source)
# stylesheet_link_tag :all, :concat => true
#
def stylesheet_link_tag(*sources)
- if config.use_sprockets
- sprockets_stylesheet_link_tag(*sources)
- else
- @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
- @stylesheet_include.include_tag(*sources)
- end
+ @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
+ @stylesheet_include.include_tag(*sources)
end
end

1 comment on commit de63942

Contributor

masterkain commented on de63942 Jun 3, 2011

Getting:
undefined method `sprockets_javascript_include_tag' for #<#Class:0x00000104902360:0x000001048ddbf0>

whenever I use a simple

javascript_include_tag 'application'
Please sign in to comment.