From b83efadb32fe55ba7a7d23d650a8adc1a351eab7 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Tue, 5 Jun 2007 16:51:49 +0000 Subject: Assume html format when rendering partials in RJS. #8076 [Rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6950 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/prototype_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb') diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 33e52bfa6e..d1f992486f 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -631,9 +631,13 @@ module ActionView end def render(*options_for_render) + old_format = @context && @context.template_format + @context.template_format = :html if @context Hash === options_for_render.first ? @context.render(*options_for_render) : options_for_render.first.to_s + ensure + @context.template_format = old_format if @context end def javascript_object_for(object) -- cgit v1.2.3