aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-11-27 21:04:24 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-29 10:45:06 +0100
commit34905673a3018edeff71aafeceb64e487304d31d (patch)
tree02264b718d54ffb2a513ad9a05bf2c7a6f572589 /railties
parent6fa9957e0e83f327aaffe34679a5752fc2343fae (diff)
downloadrails-34905673a3018edeff71aafeceb64e487304d31d.tar.gz
rails-34905673a3018edeff71aafeceb64e487304d31d.tar.bz2
rails-34905673a3018edeff71aafeceb64e487304d31d.zip
Revert "Super lazy load view paths in development mode (no indexing or caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading.
This reverts commit 4d910b033379727e5e7355590c50c72fc75e56db.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/initializer.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index a69898e2c5..0c06d1bf21 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -372,10 +372,9 @@ Run `rake gems:install` to install the missing gems.
def load_view_paths
if configuration.frameworks.include?(:action_view)
- if configuration.cache_classes
- ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller)
- ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer)
- end
+ ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes
+ ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller)
+ ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer)
end
end