r9788 - helma-ng/trunk/modules/helma/webapp

Author: hannes
Date: 2009-05-15 14:02:06 +0200 (Fri, 15 May 2009)
New Revision: 9788

Modified:
   helma-ng/trunk/modules/helma/webapp/response.js
Log:
Adapt to renamed core/json module, plus cosmetic fixes

Details at http://dev.helma.org/trac/helma/changeset/9788

Modified: helma-ng/trunk/modules/helma/webapp/response.js
===================================================================
--- helma-ng/trunk/modules/helma/webapp/response.js	2009-05-15 11:20:44 UTC (rev 9787)
+++ helma-ng/trunk/modules/helma/webapp/response.js	2009-05-15 12:02:06 UTC (rev 9788)
@@ -8,7 +8,7 @@
 
     var config = require('helma/webapp/env').config;
     var status = 200;
-    var charset = config.charset || 'utf8';
+    var charset = config.charset || 'utf-8';
     var contentType = config.contentType || 'text/html';
     var headers = {};
     var buffer = new Buffer();
@@ -155,8 +155,8 @@
 }
 
 function JSONResponse(object) {
-    var json = require('core/json2').JSON;
-    var res = new Response(json.stringify(object));
+    var JSON = require('core/json').JSON;
+    var res = new Response(JSON.stringify(object));
     res.contentType = 'application/json';
     return res;
 }