diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-19 03:20:39 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-19 03:20:39 +0000 |
commit | 84b0f9c739ffb82f3b8e0571c400014c34d0e369 (patch) | |
tree | cae7ff7cf03695f0ad9483a933a097e5c898d5b2 /actionpack/lib/action_controller/layout.rb | |
parent | 4a644575c83d78e751f49cb6ba47e1c98af693a8 (diff) | |
download | rails-84b0f9c739ffb82f3b8e0571c400014c34d0e369.tar.gz rails-84b0f9c739ffb82f3b8e0571c400014c34d0e369.tar.bz2 rails-84b0f9c739ffb82f3b8e0571c400014c34d0e369.zip |
Introduce TemplateFinder to handle view paths and lookups. Closes #10800.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
-rw-r--r-- | actionpack/lib/action_controller/layout.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index a81efc2693..0fbbfa8b05 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -208,12 +208,6 @@ module ActionController #:nodoc: conditions.inject({}) {|hash, (key, value)| hash.merge(key => [value].flatten.map {|action| action.to_s})} end - def layout_directory_exists_cache - @@layout_directory_exists_cache ||= Hash.new do |h, dirname| - h[dirname] = File.directory? dirname - end - end - def default_layout_with_format(format, layout) list = layout_list if list.grep(%r{layouts/#{layout}\.#{format}(\.[a-z][0-9a-z]*)+$}).empty? @@ -313,13 +307,8 @@ module ActionController #:nodoc: end end - # Does a layout directory for this class exist? - # we cache this info in a class level hash def layout_directory?(layout_name) - view_paths.find do |path| - next unless template_path = Dir[File.join(path, 'layouts', layout_name) + ".*"].first - self.class.send!(:layout_directory_exists_cache)[File.dirname(template_path)] - end + @template.finder.find_template_extension_from_handler(File.join('layouts', layout_name)) end end end |