diff options
| author | Dmitry Vorotilin <d.vorotilin@gmail.com> | 2012-07-11 12:18:52 +0400 |
|---|---|---|
| committer | Dmitry Vorotilin <d.vorotilin@gmail.com> | 2012-07-18 10:48:24 +0400 |
| commit | eb19ca3457c7b9908c71376f9b3b4431fcd24c6f (patch) | |
| tree | a97dfbd60788f860f92d64748a8b9bd673b23bfd /actionpack/lib/action_view/lookup_context.rb | |
| parent | d00b635242120f4262178909d93faf4473b1055e (diff) | |
| download | rails-eb19ca3457c7b9908c71376f9b3b4431fcd24c6f.tar.gz rails-eb19ca3457c7b9908c71376f9b3b4431fcd24c6f.tar.bz2 rails-eb19ca3457c7b9908c71376f9b3b4431fcd24c6f.zip | |
Common behavior with adding formats to lookup_context for TemplateRenderer and PartialRenderer
Diffstat (limited to 'actionpack/lib/action_view/lookup_context.rb')
| -rw-r--r-- | actionpack/lib/action_view/lookup_context.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb index 00989ec405..47dd932c71 100644 --- a/actionpack/lib/action_view/lookup_context.rb +++ b/actionpack/lib/action_view/lookup_context.rb @@ -96,7 +96,7 @@ module ActionView # Helpers related to template lookup using the lookup context information. module ViewPaths - attr_reader :view_paths + attr_reader :view_paths, :html_fallback_for_js # Whenever setting view paths, makes a copy so we can manipulate then in # instance objects as we wish. @@ -184,7 +184,10 @@ module ActionView def formats=(values) if values values.concat(default_formats) if values.delete "*/*" - values << :html if values == [:js] + if values == [:js] + values << :html + @html_fallback_for_js = true + end end super(values) end |