v0.5.27 correct player V00.05.27
authorcavaliet
Tue, 15 Jul 2014 17:33:15 +0200
changeset 126 63a77682d8da
parent 125 6b3feda4a0b4
child 127 1cf1c20e4496
v0.5.27 correct player
src/spel/__init__.py
src/spel/static/spel/metadataplayer/SpelSyncHtml.js
src/spel/templates/spel_player.html
--- a/src/spel/__init__.py	Tue Jul 15 17:06:30 2014 +0200
+++ b/src/spel/__init__.py	Tue Jul 15 17:33:15 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 5, 26, "final", 0)
+VERSION = (0, 5, 27, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
--- a/src/spel/static/spel/metadataplayer/SpelSyncHtml.js	Tue Jul 15 17:06:30 2014 +0200
+++ b/src/spel/static/spel/metadataplayer/SpelSyncHtml.js	Tue Jul 15 17:33:15 2014 +0200
@@ -17,8 +17,13 @@
         basesrc = this.src.replace(/#.*$/,'');
     this.getWidgetAnnotations().forEach(function(a) {
         a.on("enter", function() {
-            if (a.content && a.content.data && a.content.data.ref_text) {
-                frame.src = basesrc + '#' + a.content.data.ref_text;
+            if (a.keywords && a.keywords.hasOwnProperty("length")) {
+                var nb = a.keywords.length;
+                for(var i=0;i<nb;i++){
+                    if(a.keywords[i].substr(0,9)=="ref_text:"){
+                        frame.src = basesrc + '#' + a.keywords[i].substr(10);
+                    }
+                }
             }
         });
     });
--- a/src/spel/templates/spel_player.html	Tue Jul 15 17:06:30 2014 +0200
+++ b/src/spel/templates/spel_player.html	Tue Jul 15 17:33:15 2014 +0200
@@ -56,13 +56,13 @@
                     {
                         type: "MultiSegments",
                         //annotation_type: ["performance","discussion"]
-                    },
+                    },/*
                     {
                         type: "Annotation",
                         show_social: false,
                         show_annotation_type: true,
                         //annotation_type: ["performance","discussion"]
-                    },/*
+                    },
                     {
                         type: "Polemic",
                         annotation_type: "interpretation",