Bugfixes
authorveltr
Wed, 19 Sep 2012 14:59:35 +0900
changeset 963 d58d0dcdb640
parent 961 e1baacb52075
child 964 d7d56ea2d0a6
Bugfixes
src/widgets/AnnotationsList.js
src/widgets/JwpPlayer.js
test/jwplayer.htm
--- a/src/widgets/AnnotationsList.js	Wed Sep 19 14:11:49 2012 +0900
+++ b/src/widgets/AnnotationsList.js	Wed Sep 19 14:59:35 2012 +0900
@@ -91,7 +91,6 @@
     var _currentTime = this.media.getCurrentTime(),
         _duration = this.media.duration;
     this.lastAjaxQuery = _currentTime;
-    _currentTime = Math.floor(1000 * _currentTime);
     var _url = Mustache.to_html(this.ajax_url, {
         media : this.source.currentMedia.id,
         begin : Math.max(0, _currentTime - this.ajax_granularity),
@@ -252,7 +251,7 @@
         if (this.mashupMode) {
             this.ajaxMashup();
         } else {
-            if (Math.abs(_currentTime - this.lastAjaxQuery) > (this.ajax_granularity / 2000)) {
+            if (Math.abs(_currentTime - this.lastAjaxQuery) > (this.ajax_granularity)) {
                 this.ajaxSource();
             }
         }
--- a/src/widgets/JwpPlayer.js	Wed Sep 19 14:11:49 2012 +0900
+++ b/src/widgets/JwpPlayer.js	Wed Sep 19 14:59:35 2012 +0900
@@ -47,7 +47,7 @@
     // Binding functions to jwplayer
 
     this.media.getCurrentTime = function() {
-        return new IriSP.Model.Time(1000*_player.getPosition());
+        return new IriSP.Model.Time(1000*_player.getPosition() || 0);
     }
     this.media.getVolume = function() {
         return _player.getVolume() / 100;
--- a/test/jwplayer.htm	Wed Sep 19 14:11:49 2012 +0900
+++ b/test/jwplayer.htm	Wed Sep 19 14:59:35 2012 +0900
@@ -74,7 +74,10 @@
             {
                 type: "AnnotationsList",
                 container: "AnnotationsListContainer",
-                default_thumbnail : "http://ldt.iri.centrepompidou.fr/static/site/ldt/css/imgs/video_sequence.png"
+                default_thumbnail : "http://ldt.iri.centrepompidou.fr/static/site/ldt/css/imgs/video_sequence.png",
+                ajax_url: "/pf/ldtplatform/api/ldt/segments/{{media}}/{{begin}}/{{end}}",
+                ajax_granularity : 300000,
+                default_thumbnail : "http://capsicum//pf/static/site/ldt/css/imgs/video_sequence.png"
             },
             { type: "Mediafragment"}
         ]