diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-06-27 21:24:21 +0300 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-07-03 19:43:06 +0300 |
| commit | 12cf8f348b591b7bb0dc899345293a8e37ddad7c (patch) | |
| tree | deed5125fe33f677413b15d242431b32ae39b156 /actionpack/lib/action_view | |
| parent | dc2d754d60378b529c239e1291932503d4d8fca5 (diff) | |
| download | rails-12cf8f348b591b7bb0dc899345293a8e37ddad7c.tar.gz rails-12cf8f348b591b7bb0dc899345293a8e37ddad7c.tar.bz2 rails-12cf8f348b591b7bb0dc899345293a8e37ddad7c.zip | |
Move template_format logic out to the request so it's alongside the 'regular' request format.
Use xhr? instead of the expensive trip through Request#accepts.
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 9e255bd324..e8e690abec 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -273,17 +273,7 @@ module ActionView #:nodoc: return @template_format if @template_format if controller && controller.respond_to?(:request) - parameter_format = controller.request.parameters[:format] - accept_format = controller.request.accepts.first - - case - when parameter_format.blank? && accept_format != :js - @template_format = :html - when parameter_format.blank? && accept_format == :js - @template_format = :js - else - @template_format = parameter_format.to_sym - end + @template_format = controller.request.template_format else @template_format = :html end |