From 666d3fd0c156a5c47eeddfe87dc466863890ba70 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 7 Aug 2012 11:44:24 -0500 Subject: Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of what this makes ERB files look like. This reverts commit 46b8bceedd3e47169c50a04c93161424909c75fb, reversing changes made to 2f58795e783150f2e1b1f6c64e305703f0061129. --- actionpack/lib/action_view/template/handlers/erb.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb index 4e80c4f456..aa8eac7846 100644 --- a/actionpack/lib/action_view/template/handlers/erb.rb +++ b/actionpack/lib/action_view/template/handlers/erb.rb @@ -37,10 +37,6 @@ module ActionView end end - class ErubisWithPercentLine < Erubis - include ::Erubis::PercentLineEnhancer - end - class ERB # Specify trim mode for the ERB compiler. Defaults to '-'. # See ERB documentation for suitable values. @@ -80,12 +76,10 @@ module ActionView # Always make sure we return a String in the default_internal erb.encode! - mode = self.class.erb_trim_mode.to_s - implementation = self.class.erb_implementation - if mode.include? "%" and implementation == Erubis - implementation = ErubisWithPercentLine - end - implementation.new(erb, :trim => mode.include?("-")).src + self.class.erb_implementation.new( + erb, + :trim => (self.class.erb_trim_mode == "-") + ).src end private -- cgit v1.2.3