aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2014-03-19 19:23:29 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2014-03-21 19:37:29 +0100
commit06b4f01fca1a31f174e24852e0bc2728e136e0b6 (patch)
tree6cd4aedf189fca00b2ae5ef71d45a042fd64ae32 /actionview
parent1cb9f59f3a68f58b9ed339611a84eee7c247e4e7 (diff)
downloadrails-06b4f01fca1a31f174e24852e0bc2728e136e0b6.tar.gz
rails-06b4f01fca1a31f174e24852e0bc2728e136e0b6.tar.bz2
rails-06b4f01fca1a31f174e24852e0bc2728e136e0b6.zip
Fix for digestor to consider variants for partials -- this still needs more testing!!
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/digestor.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb
index e55b9108f0..af7cfcfb6b 100644
--- a/actionview/lib/action_view/digestor.rb
+++ b/actionview/lib/action_view/digestor.rb
@@ -100,7 +100,7 @@ module ActionView
def nested_dependencies
dependencies.collect do |dependency|
- dependencies = PartialDigestor.new(name: dependency, format: format, finder: finder).nested_dependencies
+ dependencies = PartialDigestor.new(name: dependency, format: format, variant: variant, finder: finder).nested_dependencies
dependencies.any? ? { dependency => dependencies } : dependency
end
end
@@ -133,7 +133,7 @@ module ActionView
def dependency_digest
template_digests = dependencies.collect do |template_name|
- Digestor.digest(name: template_name, format: format, finder: finder, partial: true)
+ Digestor.digest(name: template_name, format: format, variant: variant, finder: finder, partial: true)
end
(template_digests + injected_dependencies).join("-")