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

Merge pull request #1017 from bhollis/url_for

Browse source 
Look for assets using url_for before falling back to the "images" directory
This commit is contained in:
Thomas Reynolds 2013-09-24 23:33:53 -07:00
parent 48d878fb2e f2538f2e54
commit d842db1772
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -176,6 +176,9 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
if path.include?('//') or path.start_with?('data:') if path.include?('//') or path.start_with?('data:')
path path
else # rewrite paths to use their destination path else # rewrite paths to use their destination path
if resource = sitemap.find_resource_by_destination_path(url_for(path))
resource.url
else
path = File.join(prefix, path) path = File.join(prefix, path)
if resource = sitemap.find_resource_by_path(path) if resource = sitemap.find_resource_by_path(path)
resource.url resource.url
@ -184,6 +187,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
end end
end end
end end
end
# Given a source path (referenced either absolutely or relatively) # Given a source path (referenced either absolutely or relatively)
# or a Resource, this will produce the nice URL configured for that # or a Resource, this will produce the nice URL configured for that