equal
deleted
inserted
replaced
58 return self._get_json_data(rset) |
58 return self._get_json_data(rset) |
59 |
59 |
60 def _get_json_data(self, rset): |
60 def _get_json_data(self, rset): |
61 json_data = super(JsonpController, self).publish(rset) |
61 json_data = super(JsonpController, self).publish(rset) |
62 if 'callback' in self._cw.form: # jsonp |
62 if 'callback' in self._cw.form: # jsonp |
63 json_padding = self._cw.form['callback'] |
63 json_padding = self._cw.form['callback'].encode('ascii') |
64 # use ``application/javascript`` is ``callback`` parameter is |
64 # use ``application/javascript`` if ``callback`` parameter is |
65 # provided, let ``application/json`` otherwise |
65 # provided, keep ``application/json`` otherwise |
66 self._cw.set_content_type('application/javascript') |
66 self._cw.set_content_type('application/javascript') |
67 json_data = '%s(%s)' % (json_padding, json_data) |
67 json_data = b'%s(%s)' % (json_padding, json_data) |
68 return json_data |
68 return json_data |
69 |
69 |
70 |
70 |
71 class JsonMixIn(object): |
71 class JsonMixIn(object): |
72 """mixin class for json views |
72 """mixin class for json views |