[infrae.fileupload][Sylvain Viollon] Fix content_type in the res...

author:    Sylvain Viollon
date:      Mon Aug 19 18:58:13 2013 +0200
revision:  20:559b71701ece in infrae.fileupload
branch:    
details:   https://hg.infrae.com/infrae.fileupload?cmd=changeset;node=559b71701ece
modified:  src/infrae/fileupload/middleware.py
added:     
removed:   
log:       Fix content_type in the response while using jsonp.


diffstat:

 src/infrae/fileupload/middleware.py |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 8970749858f0 -r 559b71701ece src/infrae/fileupload/middleware.py
--- a/src/infrae/fileupload/middleware.py	Mon Aug 19 18:30:59 2013 +0200
+++ b/src/infrae/fileupload/middleware.py	Mon Aug 19 18:58:13 2013 +0200
@@ -441,10 +441,11 @@
         else:
             result = '{"success": true}'
         response = Response()
-        response.content_type = 'application/json'
         if 'callback' in request.GET:
+            response.content_type = 'application/javascript'
             response.body = str(request.GET['callback']) + '(' + result + ')'
         else:
+            response.content_type = 'application/json'
             response.body = result
         return response
 
@@ -463,10 +464,11 @@
             result = {'state': 'error', 'error': error.msg}
 
         response = Response()
-        response.content_type = 'application/json'
         if 'callback' in request.GET:
+            response.content_type = 'application/javascript'
             response.body = str(request.GET['callback']) + '(' + json.dumps(result) + ')'
         else:
+            response.content_type = 'application/json'
             response.body = json.dumps(result)
         return response