src/js/widgets/annotationsListWidget.js
branchpopcorn-port
changeset 602 b35862f9b0b0
parent 599 a5a5e70d46a7
child 603 58dfdafb5410
--- a/src/js/widgets/annotationsListWidget.js	Mon Jan 09 17:22:36 2012 +0100
+++ b/src/js/widgets/annotationsListWidget.js	Mon Jan 09 17:23:08 2012 +0100
@@ -17,13 +17,22 @@
 
   var view_type = this._serializer.getContributions();
   var annotations = this._serializer._data.annotations;
+  var currentTime = this._Popcorn.currentTime();
+  
+  /* happens when the player hasn't yet loaded */
+  if (typeof(currentTime) === "undefined") {
+    window.setTimeout(IriSP.wrap(this, this.drawList), 4000);
+    return;
+  }
+  
   var list = [];
 
   if (typeof(view_type) === "undefined") {
-    console.log("not type suitable for display");
+    console.log("no type suitable for display");
     return;
   }
 
+  console.log(currentTime);
   for (i = 0; i < annotations.length; i++) {
     var annotation = annotations[i];
 
@@ -33,6 +42,11 @@
         continue;
     }
 
+    /* only get the annotations happening in the current chapter */
+    if (annotation.begin > currentTime || annotation.end <= currentTime) {
+        continue;
+    }
+    
     var a = annotation;
     var obj = {};
 
@@ -53,6 +67,7 @@
 
   this.drawList();
   this._Popcorn.listen("IriSP.createAnnotationWidget.addedAnnotation", IriSP.wrap(this, this.redraw));
+  this._Popcorn.listen("seeked", IriSP.wrap(this, this.redraw));
 };
 
 IriSP.AnnotationsListWidget.prototype.redraw = function() {