diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-18 15:12:18 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-18 15:12:18 -0800 |
commit | 8a5059383e7bf4bfe0bfd308ab511d578b1a6ce8 (patch) | |
tree | 0daeef7ace462fa91d1f10e41c9da5ca9b209bc5 | |
parent | 5ae91da11990258302fbc879cd993f7eea925caa (diff) | |
download | rails-8a5059383e7bf4bfe0bfd308ab511d578b1a6ce8.tar.gz rails-8a5059383e7bf4bfe0bfd308ab511d578b1a6ce8.tar.bz2 rails-8a5059383e7bf4bfe0bfd308ab511d578b1a6ce8.zip |
push partial name regexp up
we know that all child templates will be considered as "partials", so
the only one that needs detection by name is the root node
-rw-r--r-- | actionview/lib/action_view/digestor.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index d0b86b4c03..b99d1af998 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -28,7 +28,8 @@ module ActionView # (Concurrent::Map's lookups have volatile semantics) finder.digest_cache[cache_key] || @@digest_mutex.synchronize do finder.digest_cache.fetch(cache_key) do # re-check under lock - root = tree(name, finder) + partial = name.include?("/_") + root = tree(name, finder, partial) dependencies.each do |injected_dep| root.children << Injected.new(injected_dep, nil, nil) end @@ -44,7 +45,6 @@ module ActionView # Create a dependency tree for template named +name+. def tree(name, finder, partial = false, seen = {}) logical_name = name.gsub(%r|/_|, "/") - partial = partial || name.include?("/_") if finder.disable_cache { finder.exists?(logical_name, [], partial) } template = finder.disable_cache { finder.find(logical_name, [], partial) } |