Merge pull request #2321 from omjokine/master

JSONP should use mimetype application/javascript
rails · Apr 29, 2012 · d4dd1af · d4dd1af · carlosantoniodasilva · Apr 29, 2012
2 parents e6ab0d5 + b4e1903
commit d4dd1af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
@@ -91,7 +91,10 @@ module All
 
     add :json do |json, options|
       json = json.to_json(options) unless json.kind_of?(String)
-      json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
+      unless options[:callback].blank?
+        json = "#{options[:callback]}(#{json})"
+        self.content_type ||= Mime::JS
+      end
       self.content_type ||= Mime::JSON
       json
     end

diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
@@ -102,7 +102,7 @@ def test_render_json_with_status
   def test_render_json_with_callback
     get :render_json_hello_world_with_callback
     assert_equal 'alert({"hello":"world"})', @response.body
-    assert_equal 'application/json', @response.content_type
+    assert_equal 'application/javascript', @response.content_type
   end
 
   def test_render_json_with_custom_content_type