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_controller/request.rb | |
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_controller/request.rb')
-rwxr-xr-x | actionpack/lib/action_controller/request.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 9b02f2c8a1..c91a3387a0 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -116,6 +116,19 @@ module ActionController @format = Mime::Type.lookup_by_extension(parameters[:format]) end + def template_format + parameter_format = parameters[:format] + + case + when parameter_format.blank? && !xhr? + :html + when parameter_format.blank? && xhr? + :js + else + parameter_format.to_sym + end + end + # Returns true if the request's "X-Requested-With" header contains # "XMLHttpRequest". (The Prototype Javascript library sends this header with # every Ajax request.) |