@@ -161,10 +161,9 @@ module ActionView #:nodoc: attr_accessor :output_buffer - # Specify trim mode for the ERB compiler. Defaults to '-'. - # See ERb documentation for suitable values. - @@erb_trim_mode = '-' - cattr_accessor :erb_trim_mode + class << self + delegate :erb_trim_mode=, :to => 'ActionView::TemplateHandlers::ERB' + end # Specify whether file modification times should be checked to see if a template needs recompilation @@cache_template_loading = false actionpack/lib/action_view/base.rb @@ -42,8 +42,13 @@ module ActionView class ERB < TemplateHandler include Compilable + # Specify trim mode for the ERB compiler. Defaults to '-'. + # See ERb documentation for suitable values. + cattr_accessor :erb_trim_mode + self.erb_trim_mode = '-' + def compile(template) - ::ERB.new(template.source, nil, @view.erb_trim_mode, '@output_buffer').src + ::ERB.new(template.source, nil, erb_trim_mode, '@output_buffer').src end def cache_fragment(block, name = {}, options = nil) #:nodoc: actionpack/lib/action_view/template_handlers/erb.rb 2e232af91f7e276904e02cbb1ea42ea24c19255b Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/c440c9b199d7474e356472616ef03f9c7e17c405 c440c9b199d7474e356472616ef03f9c7e17c405 2008-06-19T17:18:07-07:00 2008-06-19T17:18:07-07:00 Move erb_trim_mode setting to the ERB template handler. Keep a Base.erb_trim_mode= delegator around. 8c115c85d38870ad08951fe3d5c0bd6c81a7b71a Jeremy Kemper jeremy@bitsweat.net