aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-03-29 21:40:24 -0500
committerJoshua Peek <josh@joshpeek.com>2011-03-29 21:40:24 -0500
commit77d8f7a4b71d7f52a7ba6f8bc7f7f6f6ac9b81e0 (patch)
tree0ce1191b113eb2dd83100eb421d28cde4ad278f4 /actionpack/lib/action_view
parent651d371a247b0c473fb35a62076e480d95d84a35 (diff)
downloadrails-77d8f7a4b71d7f52a7ba6f8bc7f7f6f6ac9b81e0.tar.gz
rails-77d8f7a4b71d7f52a7ba6f8bc7f7f6f6ac9b81e0.tar.bz2
rails-77d8f7a4b71d7f52a7ba6f8bc7f7f6f6ac9b81e0.zip
Seperate asset directories
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/sprockets_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index 4f19f4bb21..408a2030ab 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -48,7 +48,9 @@ module ActionView
end
# Fingerprint url
- source = assets.path(source, config.perform_caching)
+ if source =~ /^\/#{dir}\/(.+)/
+ source = assets.path($1, config.perform_caching, dir)
+ end
host = compute_asset_host(source)