diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-03-03 17:36:08 -0800 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:24:01 -0800 |
commit | b160663bd13d08bf845bc8cdf87a2c5e7e46f901 (patch) | |
tree | 5144a55d7169b42132a878a65a583d9472b3b0b3 /actionpack/lib/action_view/base.rb | |
parent | 54302ef55bffd1a93f20f5d1ae81217b2e4149c4 (diff) | |
download | rails-b160663bd13d08bf845bc8cdf87a2c5e7e46f901.tar.gz rails-b160663bd13d08bf845bc8cdf87a2c5e7e46f901.tar.bz2 rails-b160663bd13d08bf845bc8cdf87a2c5e7e46f901.zip |
Start refactoring the method of configuring ActionView
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 2d2b53a6ce..87a1972fb4 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -175,15 +175,6 @@ module ActionView #:nodoc: include Helpers, Rendering, Partials, ::ERB::Util - def config - self.config = DEFAULT_CONFIG unless @config - @config - end - - def config=(config) - @config = ActiveSupport::OrderedOptions.new.merge(config) - end - extend ActiveSupport::Memoizable attr_accessor :base_path, :assigns, :template_extension @@ -306,12 +297,13 @@ module ActionView #:nodoc: @helpers = self.class.helpers || Module.new @_controller = controller + @_config = controller.config if controller @_content_for = Hash.new {|h,k| h[k] = ActiveSupport::SafeBuffer.new } @_virtual_path = nil self.view_paths = view_paths end - attr_internal :controller, :template + attr_internal :controller, :template, :config attr_reader :view_paths def view_paths=(paths) |