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

Fix Padrino integration after merge

Browse source
This commit is contained in:
Ben Hollis 2014-02-22 20:10:25 -08:00
parent 7b46fd6524
commit c5b0ba17ea
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
handler = auto_find_proper_handler(&block) handler = auto_find_proper_handler(&block)
captured_block, captured_html = nil, '' captured_block, captured_html = nil, ''
if handler && handler.block_is_type?(block) if handler && handler.engine_matches?(block)
captured_html, captured_block = handler.capture_from_template(*args, &block) captured_html, captured_block = handler.capture_from_template(*args, &block)
end end
@ -80,7 +80,13 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
def auto_find_proper_handler(&block) def auto_find_proper_handler(&block)
if block_given? if block_given?
engine = File.extname(block.source_location[0])[1..-1].to_sym engine = File.extname(block.source_location[0])[1..-1].to_sym
::Padrino::Helpers::OutputHelpers.handlers.map { |h| h.new(self) }.find { |h| h.engines.include?(engine) && h.block_is_type?(block) } ::Padrino::Helpers::OutputHelpers.handlers.select do |e, h|
e == engine
end.values.map do |h|
h.new(self)
end.find do |h|
h.engine_matches?(block)
end
else else
find_proper_handler find_proper_handler
end end