public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Use Mime::JS in place of explicit 'text/javascript' [#1573 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
mojodna (author)
Mon Dec 15 10:18:45 -0800 2008
josh (committer)
Mon Dec 15 10:18:45 -0800 2008
commit  4966076d35d5d9510590d87d90dae8daf79b2069
tree    a9556ab5a6c6c4972084287757be2cfc905dbfe7
parent  f36dafa492e3de66e624d81d6860f5f0536de6b0
...
227
228
229
230
231
232
 
233
234
235
...
227
228
229
 
 
 
230
231
232
233
0
@@ -227,9 +227,7 @@ module ActionController
0
       def xml_http_request(request_method, path, parameters = nil, headers = nil)
0
         headers ||= {}
0
         headers['X-Requested-With'] = 'XMLHttpRequest'
0
-        headers['Accept'] ||= 'text/javascript, text/html, application/xml, ' +
0
-                              'text/xml, */*'
0
-
0
+        headers['Accept'] ||= [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
0
         process(request_method, path, parameters, headers)
0
       end
0
       alias xhr :xml_http_request
...
413
414
415
416
 
417
418
419
...
413
414
415
 
416
417
418
419
0
@@ -413,7 +413,7 @@ module ActionController #:nodoc:
0
 
0
     def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
0
       @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
0
-      @request.env['HTTP_ACCEPT'] = 'text/javascript, text/html, application/xml, text/xml, */*'
0
+      @request.env['HTTP_ACCEPT'] =  [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
0
       returning __send__(request_method, action, parameters, session, flash) do
0
         @request.env.delete 'HTTP_X_REQUESTED_WITH'
0
         @request.env.delete 'HTTP_ACCEPT'

Comments