diff options
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 18 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/sprockets_helper.rb | 15 |
2 files changed, 25 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index f6b2d4f3f4..10bdede1b4 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -274,7 +274,11 @@ module ActionView # The alias +path_to_image+ is provided to avoid that. Rails uses the alias internally, and # plugin authors are encouraged to do so. def image_path(source) - asset_paths.compute_public_path(source, 'images') + if config.use_sprockets + sprockets_asset_path(source) + else + asset_paths.compute_public_path(source, 'images') + end end alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route @@ -289,7 +293,11 @@ module ActionView # video_path("/trailers/hd.avi") # => /trailers/hd.avi # video_path("http://www.railsapplication.com/vid/hd.avi") # => http://www.railsapplication.com/vid/hd.avi def video_path(source) - asset_paths.compute_public_path(source, 'videos') + if config.use_sprockets + sprockets_asset_path(source) + else + asset_paths.compute_public_path(source, 'videos') + end end alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route @@ -304,7 +312,11 @@ module ActionView # audio_path("/sounds/horse.wav") # => /sounds/horse.wav # audio_path("http://www.railsapplication.com/sounds/horse.wav") # => http://www.railsapplication.com/sounds/horse.wav def audio_path(source) - asset_paths.compute_public_path(source, 'audios') + if config.use_sprockets + sprockets_asset_path(source) + else + asset_paths.compute_public_path(source, 'audios') + end end alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb index 408a2030ab..fee13be886 100644 --- a/actionpack/lib/action_view/helpers/sprockets_helper.rb +++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb @@ -3,8 +3,12 @@ require 'uri' module ActionView module Helpers module SprocketsHelper + def sprockets_asset_path(source, default_ext = nil) + compute_sprockets_path(source, 'assets', default_ext) + end + def sprockets_javascript_path(source) - compute_sprockets_path source, 'assets', 'js' + sprockets_asset_path(source, 'js') end def sprockets_javascript_include_tag(source, options = {}) @@ -17,9 +21,9 @@ module ActionView end def sprockets_stylesheet_path(source) - compute_sprockets_path source, 'assets', 'css' + sprockets_asset_path(source, 'css') end - + def sprockets_stylesheet_link_tag(source, options = {}) options = { 'rel' => "stylesheet", @@ -31,13 +35,14 @@ module ActionView tag 'link', options end + private - def compute_sprockets_path(source, dir, default_ext) + def compute_sprockets_path(source, dir, default_ext = nil) source = source.to_s return source if URI.parse(source).host - # Add /javscripts to relative paths + # Add /assets to relative paths if source[0] != ?/ source = "/#{dir}/#{source}" end |