src/js/widgets/annotationsListWidget.js
branchpopcorn-port
changeset 603 58dfdafb5410
parent 602 b35862f9b0b0
child 605 e1a6f73038b4
--- a/src/js/widgets/annotationsListWidget.js	Mon Jan 09 17:23:08 2012 +0100
+++ b/src/js/widgets/annotationsListWidget.js	Tue Jan 10 11:40:31 2012 +0100
@@ -32,7 +32,6 @@
     return;
   }
 
-  console.log(currentTime);
   for (i = 0; i < annotations.length; i++) {
     var annotation = annotations[i];
 
@@ -43,18 +42,18 @@
     }
 
     /* only get the annotations happening in the current chapter */
-    if (annotation.begin > currentTime || annotation.end <= currentTime) {
+    if (!(annotation.begin <= currentTime * 1000 && annotation.end > currentTime * 1000)) {        
         continue;
     }
-    
+
     var a = annotation;
     var obj = {};
 
     obj["id"] = a.id;
     obj["title"] = a.content.title;
     obj["desc"] = a.content.description;
-    obj["begin"] = IriSP.msToTime(a.begin);
-    obj["end"] = IriSP.msToTime(a.end);
+    obj["begin"] = IriSP.msToTime(annotation.begin);
+    obj["end"] = IriSP.msToTime(annotation.end);
 
     list.push(obj);
   }