User: allisterbeharry Branch: DRUPAL-6--1 Date: Tue, 26 Jan 2010 05:25:18 +0000 Modified files: /modules/views_datasource views-view-json.tpl.php views_json.module views_json.views.inc views_plugin_style_json.inc Log message: #674562 Patch by icylace: http://drupal.org/node/674562 1.Now using 'Content-Type: application/json; charset=utf-8' when setting the HTTP response header. 2.In the style options, renamed "coder mode" to "Views API mode" to avoid potential confusion with the Coder module. Views originally using coder mode must be brought up-to-date by activating Views API mode in the style options. 3.Now using json_encode() for JSON encoding when not previewing in the Views UI. 4.After looking at the JSON spec again, stopped using views_json_check_label(). The object field labels are defined as normal JSON strings and should be treated as such. views_json_check_label() remains available on its own. 5.Updated some comments. 6.Renamed _json_preview_render() to json_encode_formatted(). 7.Moved the special character encoding code into json_encode_formatted() which removed the need for views_json_encode_special_chars(). Links: http://cvs.drupal.org/diff.php?path=contributions/modules/views_datasource/v... http://cvs.drupal.org/diff.php?path=contributions/modules/views_datasource/v... http://cvs.drupal.org/diff.php?path=contributions/modules/views_datasource/v... http://cvs.drupal.org/diff.php?path=contributions/modules/views_datasource/v...