diff options
| -rw-r--r-- | actionpack/lib/action_controller/metal/renderers.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb index d69816915b..4a0c1c7dd7 100644 --- a/actionpack/lib/action_controller/metal/renderers.rb +++ b/actionpack/lib/action_controller/metal/renderers.rb @@ -91,12 +91,14 @@ module ActionController add :json do |json, options| json = json.to_json(options) unless json.kind_of?(String) - unless options[:callback].blank? - json = "#{options[:callback]}(#{json})" + + if options[:callback].present? self.content_type ||= Mime::JS + "#{options[:callback]}(#{json})" + else + self.content_type ||= Mime::JSON + json end - self.content_type ||= Mime::JSON - json end add :js do |js, options| |