# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1339086358 -7200
# Node ID 8ec3ed14a95568a169cb16f9fd6dae95ddca587a
# Parent  d97a7854e9eb1137acdae00c90fa196ac1b6a02c# Parent  67402eef14a8bcf2ba2f8caf5b5a66dead1d6b84
Merge with 67402eef14a8bcf2ba2f8caf5b5a66dead1d6b84

diff -r 67402eef14a8 -r 8ec3ed14a955 web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js
--- a/web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js	Thu Jun 07 17:20:17 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js	Thu Jun 07 18:25:58 2012 +0200
@@ -1478,7 +1478,7 @@
         jwplayer : "jwplayer.js",
         raphael : "raphael-min.js",
         tracemanager : "tracemanager.js",
-        jwPlayerSWF : "../swf/player.swf"
+        jwPlayerSWF : "player.swf"
     },
     locations : {
         // use to define locations outside defautl_dir
diff -r 67402eef14a8 -r 8ec3ed14a955 web/tralalere/templates/player.html
--- a/web/tralalere/templates/player.html	Thu Jun 07 17:20:17 2012 +0200
+++ b/web/tralalere/templates/player.html	Thu Jun 07 18:25:58 2012 +0200
@@ -35,6 +35,7 @@
 {% block end_body %}
     <script type="text/javascript">
     IriSP.libFiles.defaultDir = "{{STATIC_URL}}tralalere/js";
+    IriSP.libFiles.locations.jwPlayerSWF = "{{STATIC_URL}}tralalere/swf/player.swf";
     IriSP.widgetsDir = "{{STATIC_URL}}tralalere/metadataplayer";
     var _metadata = {
         url: '{% url ldt.ldt_utils.views.json.project_json_id content.front_project.ldt_id %}',