deac
/
middleman
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1686 from stevenosloan/allow_asset_url_to_work_outside_of_a_resource 

Allow asset_url to work outside of a resource context when relative: !true
v3-stable
Thomas Reynolds 2015-11-13 10:35:06 -08:00
parent fe4d3a4bb3 30335091c8
commit fe74824651
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
View File

@ -223,7 +223,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
# @return [String] The fully qualified asset url
def asset_url(path, prefix='', options={})
# Don't touch assets which already have a full path
if path.include?('//') || path.start_with?('data:') || !current_resource
if path.include?('//') || path.start_with?('data:')
path
else # rewrite paths to use their destination path
result = if resource = sitemap.find_resource_by_destination_path(url_for(path))
@ -241,6 +241,10 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
if options[:relative] != true
result
else
unless current_resource
raise ArgumentError, "#asset_url must be run in a context with current_resource if relative: true"
end
current_dir = Pathname('/' + current_resource.destination_path)
Pathname(result).relative_path_from(current_dir.dirname).to_s
end