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

Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327

Browse source
This commit is contained in:
Thomas Reynolds 2014-08-04 15:07:55 -07:00
parent 05aa396399
commit 625391953a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
middleman-core/features/slim.feature
View file

@ -23,9 +23,10 @@ Feature: Support slim templating language
Scenario: Slim Content For Scenario: Slim Content For
Given the Server is running at "slim-content-for-app" Given the Server is running at "slim-content-for-app"
When I go to "/index.html" When I go to "/index.html"
Then I should not see "Content AContent B"
Then I should see "Content for A:Content A" Then I should see "Content for A:Content A"
Then I should see "Content for main:Content Main" Then I should see "Content for main:Content Main"
Then I should see "Content for B:Content AContent B" Then I should see "Content for B:Content B"
Scenario: Rendering Scss in a Slim filter Scenario: Rendering Scss in a Slim filter
Given an empty app Given an empty app

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

@ -73,7 +73,6 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
def auto_find_proper_handler(&block) def auto_find_proper_handler(&block)
engine = block_given? ? File.extname(block.source_location[0])[1..-1].to_sym : current_engine engine = block_given? ? File.extname(block.source_location[0])[1..-1].to_sym : current_engine
return if engine == :slim && engine == current_engine
handler_class = ::Padrino::Helpers::OutputHelpers.handlers[engine] handler_class = ::Padrino::Helpers::OutputHelpers.handlers[engine]
handler_class && handler_class.new(self) handler_class && handler_class.new(self)
end end