diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2012-08-30 05:28:31 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2012-08-30 05:28:31 -0700 |
| commit | a317e7897f38c02e84d0827cd60e10a8f59a1a95 (patch) | |
| tree | 2a2898f29b46a6e65d784522d2c293e81a85f477 /actionpack/lib | |
| parent | a0c5cc6a6df3843a73df3969226cce09620a1614 (diff) | |
| parent | e7c23a4a7a0a576231b9d77f4ec47f7f10eb7d42 (diff) | |
| download | rails-a317e7897f38c02e84d0827cd60e10a8f59a1a95.tar.gz rails-a317e7897f38c02e84d0827cd60e10a8f59a1a95.tar.bz2 rails-a317e7897f38c02e84d0827cd60e10a8f59a1a95.zip | |
Merge pull request #7483 from christos/improve_template_digestor
Better ActionView::Digestor nested template inference
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/digestor.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/digestor.rb b/actionpack/lib/action_view/digestor.rb index cfa864cdd4..899100d06c 100644 --- a/actionpack/lib/action_view/digestor.rb +++ b/actionpack/lib/action_view/digestor.rb @@ -15,10 +15,10 @@ module ActionView # render(topics) => render("topics/topic") # render(message.topics) => render("topics/topic") RENDER_DEPENDENCY = / - render\s? # render, followed by an optional space - \(? # start a optional parenthesis for the render call - (partial:)?\s? # naming the partial, used with collection -- 1st capture - ([@a-z"'][@a-z_\/\."']+) # the template name itself -- 2nd capture + render\s* # render, followed by optional whitespace + \(? # start an optional parenthesis for the render call + (partial:|:partial\s+=>)?\s* # naming the partial, used with collection -- 1st capture + ([@a-z"'][@a-z_\/\."']+) # the template name itself -- 2nd capture /x cattr_accessor(:cache) { Hash.new } |