diff options
| author | Dmitry Vorotilin <d.vorotilin@gmail.com> | 2012-07-11 12:18:52 +0400 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-04-02 10:36:23 -0700 |
| commit | 2c22376fe04b89e8f34620139720b85a85ce3428 (patch) | |
| tree | bda9c828cf2f7519a48e655b00b813543592d1ed /actionpack/lib/action_view/lookup_context.rb | |
| parent | 060fca78970e54b6400296325a212632de727b21 (diff) | |
| download | rails-2c22376fe04b89e8f34620139720b85a85ce3428.tar.gz rails-2c22376fe04b89e8f34620139720b85a85ce3428.tar.bz2 rails-2c22376fe04b89e8f34620139720b85a85ce3428.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 9f617a9a53..1a656ed37f 100644 --- a/actionpack/lib/action_view/lookup_context.rb +++ b/actionpack/lib/action_view/lookup_context.rb @@ -103,7 +103,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. @@ -200,7 +200,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 |