# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1346276377 -7200
# Node ID 6a7fa48480d021d9809bdaa6220233c8749c47c3
# Parent  6d341beaf6324d3de268d8fe69df5800151da7a2# Parent  e450dff4134fa9a0b1da74d98cc52bceadbf0a47
Merge with e450dff4134fa9a0b1da74d98cc52bceadbf0a47

diff -r 6d341beaf632 -r 6a7fa48480d0 .hgtags
--- a/.hgtags	Wed Aug 29 23:38:49 2012 +0200
+++ b/.hgtags	Wed Aug 29 23:39:37 2012 +0200
@@ -91,3 +91,4 @@
 f8c68f2925513aa9d59dd0d946786f20074d2e3e V01.18
 f8c68f2925513aa9d59dd0d946786f20074d2e3e V01.18
 eb7957008faa5dd46c28f7dad97f2d8607e02c8a V01.18
+a10c32ec1a7fc84ffc86826ecce4febe7d34daae V01.19
diff -r 6d341beaf632 -r 6a7fa48480d0 src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Wed Aug 29 23:38:49 2012 +0200
+++ b/src/ldt/ldt/__init__.py	Wed Aug 29 23:39:37 2012 +0200
@@ -1,4 +1,4 @@
-VERSION = (1, 18, 0, "final", 0)
+VERSION = (1, 19, 0, "final", 0)
 
 
 def get_version():
diff -r 6d341beaf632 -r 6a7fa48480d0 src/ldt/ldt/ldt_utils/views/json.py
--- a/src/ldt/ldt/ldt_utils/views/json.py	Wed Aug 29 23:38:49 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/json.py	Wed Aug 29 23:39:37 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'
diff -r 6d341beaf632 -r 6a7fa48480d0 src/ldt/ldt/static/ldt/swf/ldt/LignesDeTempsFlex.swf
Binary file src/ldt/ldt/static/ldt/swf/ldt/LignesDeTempsFlex.swf has changed