Browse Source

Second thoughts on mime type

After further review, changing the mime type on jsonp
responses from text/javascript to application/javascript,
with a hat-tip to
http://stackoverflow.com/questions/111302/best-content-type-to-serve-jsonp
pull/437/head
Ned Jackson Lovely 13 years ago
parent
commit
68f93634de
  1. 4
      flask/helpers.py

4
flask/helpers.py

@ -121,7 +121,7 @@ def jsonify(*args, **kwargs):
.. versionadded:: 0.9 .. versionadded:: 0.9
If the ``padded`` argument is true, the JSON object will be padded If the ``padded`` argument is true, the JSON object will be padded
for JSONP calls and the response mimetype will be changed to for JSONP calls and the response mimetype will be changed to
``text/javascript``. By default, the request arguments ``callback`` ``application/javascript``. By default, the request arguments ``callback``
and ``jsonp`` will be used as the name for the callback function. and ``jsonp`` will be used as the name for the callback function.
This will work with jQuery and most other JavaScript libraries This will work with jQuery and most other JavaScript libraries
by default. by default.
@ -141,7 +141,7 @@ def jsonify(*args, **kwargs):
del kwargs['padded'] del kwargs['padded']
json_str = json.dumps(dict(*args, **kwargs), indent=None) json_str = json.dumps(dict(*args, **kwargs), indent=None)
content = str(callback) + "(" + json_str + ")" content = str(callback) + "(" + json_str + ")"
return current_app.response_class(content, mimetype='text/javascript') return current_app.response_class(content, mimetype='application/javascript')
return current_app.response_class(json.dumps(dict(*args, **kwargs), return current_app.response_class(json.dumps(dict(*args, **kwargs),
indent=None if request.is_xhr else 2), mimetype='application/json') indent=None if request.is_xhr else 2), mimetype='application/json')

Loading…
Cancel
Save