diff options
author | Hubert Łępicki <hubert.lepicki@amberbit.com> | 2014-05-08 13:35:31 +0200 |
---|---|---|
committer | Hubert Łępicki <hubert.lepicki@amberbit.com> | 2014-05-08 20:51:59 +0200 |
commit | db9a5c5a1f8e2a1590f0ac9436587d58a67a629e (patch) | |
tree | 802cf0be729e3dd62883dfbe0f7248590d8ba8d6 /actionview/lib/action_view/helpers | |
parent | 5371106d530e64cfb221492714fb7cef32fa45c3 (diff) | |
download | rails-db9a5c5a1f8e2a1590f0ac9436587d58a67a629e.tar.gz rails-db9a5c5a1f8e2a1590f0ac9436587d58a67a629e.tar.bz2 rails-db9a5c5a1f8e2a1590f0ac9436587d58a67a629e.zip |
Improve documentation for asset_url
Updated CHANGELOG.md with entry about :host in asset_url
Diffstat (limited to 'actionview/lib/action_view/helpers')
-rw-r--r-- | actionview/lib/action_view/helpers/asset_url_helper.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb index 86a84c1356..ae684af87b 100644 --- a/actionview/lib/action_view/helpers/asset_url_helper.rb +++ b/actionview/lib/action_view/helpers/asset_url_helper.rb @@ -147,7 +147,14 @@ module ActionView # Computes the full URL to an asset in the public directory. This # will use +asset_path+ internally, so most of their behaviors - # will be the same. + # will be the same. If :host options is set, it overwrites global + # +config.action_controller.asset_host+ setting. + # + # All other options provided are forwarded to +asset_path+ call. + # + # asset_url "application.js" # => http://example.com/application.js + # asset_url "application.js", host: "http://cdn.example.com" # => http://cdn.example.com/javascripts/application.js + # def asset_url(source, options = {}) path_to_asset(source, options.merge(:protocol => :request)) end |