aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/base.rb14
1 files changed, 13 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 1a4234b2c9..5ae3e7ba11 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -403,7 +403,19 @@ module ActionView #:nodoc:
# symbolized version of the :format parameter of the request, or :html by default.
def template_format
- @template_format ||= controller.request.parameters[:format].to_sym rescue :html
+ if @template_format.nil?
+ @template_format =
+ begin
+ if controller.request.accepts.first == Mime::JS
+ :js
+ else
+ controller.request.parameters[:format].to_sym
+ end
+ rescue
+ :html
+ end
+ end
+ @template_format
end
def template_handler_preferences