Use sprockets helpers if config.use_sprockets is set

2 files changed, 22 insertions, 6 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 82bbfcc7d2..ed95f1c018 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
@@ -86,7 +86,11 @@ module ActionView
         #   javascript_path "http://www.railsapplication.com/js/xmlhr" # => http://www.railsapplication.com/js/xmlhr
         #   javascript_path "http://www.railsapplication.com/js/xmlhr.js" # => http://www.railsapplication.com/js/xmlhr.js
         def javascript_path(source)
-          asset_paths.compute_public_path(source, 'javascripts', 'js')
+          if config.use_sprockets
+            sprockets_javascript_path(source)
+          else
+            asset_paths.compute_public_path(source, 'javascripts', 'js')
+          end
         end
         alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
 
@@ -173,8 +177,12 @@ module ActionView
         #
         #   javascript_include_tag :all, :cache => true, :recursive => true
         def javascript_include_tag(*sources)
-          @javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
-          @javascript_include.include_tag(*sources)
+          if config.use_sprockets
+            sprockets_javascript_include_tag(*sources)
+          else
+            @javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
+            @javascript_include.include_tag(*sources)
+          end
         end
 
       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 a48c87b49a..a994afb65e 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
@@ -63,7 +63,11 @@ module ActionView
         #   stylesheet_path "http://www.railsapplication.com/css/style" # => http://www.railsapplication.com/css/style
         #   stylesheet_path "http://www.railsapplication.com/css/style.css" # => http://www.railsapplication.com/css/style.css
         def stylesheet_path(source)
-          asset_paths.compute_public_path(source, 'stylesheets', 'css')
+          if config.use_sprockets
+            sprockets_stylesheet_path(source)
+          else
+            asset_paths.compute_public_path(source, 'stylesheets', 'css')
+          end
         end
         alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
 
@@ -136,8 +140,12 @@ module ActionView
         #   stylesheet_link_tag :all, :concat => true
         #
         def stylesheet_link_tag(*sources)
-          @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
-          @stylesheet_include.include_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
         end
 
       end