From 69fecd11d4fabde029f0602f514cbca3b8642ccd Mon Sep 17 00:00:00 2001 From: Bryan Larsen Date: Fri, 19 Nov 2010 14:09:28 -0500 Subject: [PATCH] [#6016] allow :content_type to be set on render :update --- .../rails/actionpack/lib/action_controller/base.rb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/vendor/rails/actionpack/lib/action_controller/base.rb b/vendor/rails/actionpack/lib/action_controller/base.rb index 41a8a64..f3dd545 100644 --- a/vendor/rails/actionpack/lib/action_controller/base.rb +++ b/vendor/rails/actionpack/lib/action_controller/base.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- require 'set' module ActionController #:nodoc: @@ -968,7 +969,7 @@ module ActionController #:nodoc: @template.send(:_evaluate_assigns_and_ivars) generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(@template, &block) - response.content_type = Mime::JS + response.content_type ||= Mime::JS render_for_text(generator.to_s, options[:status]) elsif options[:nothing] -- 1.7.3.2