# HG changeset patch
# User cavaliet
# Date 1346065216 -7200
# Node ID 8aebcfead46429c02287d09ae9369acf20277d93
# Parent  3efbab60855ab66763c6d98fa4174afc0c0e3341# Parent  a98bfda6d187f61e7954de9e9500bfbdb7c39885
Merge with a98bfda6d187f61e7954de9e9500bfbdb7c39885

diff -r a98bfda6d187 -r 8aebcfead464 src/ldt/ldt/ldt_utils/views/json.py
--- a/src/ldt/ldt/ldt_utils/views/json.py	Mon Aug 27 02:21:38 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/json.py	Mon Aug 27 13:00:16 2012 +0200
@@ -144,6 +144,11 @@
     if escape_bool:
         json_str = escape(json_str)
     
+    # Callback to allo jsonp
+    callback = request.REQUEST.get("callback")
+    if callback is not None:
+        json_str = "%s(%s)" % (callback, json_str)
+    
     resp = HttpResponse(mimetype="application/json; charset=utf-8")
     resp['Cache-Control'] = 'no-cache, must-revalidate'
     resp['Pragma'] = 'no-cache'