Merge with upstream
authorhamidouk
Wed, 18 Jan 2012 16:42:52 +0100
changeset 418 b5a19e9329e0
parent 417 324f5fab9eca (diff)
parent 416 b512f69a474a (current diff)
child 419 dc8a7dc00a21
Merge with upstream
--- a/src/ldt/ldt/static/ldt/js/LdtPlayer-release.js	Wed Jan 18 16:31:01 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/LdtPlayer-release.js	Wed Jan 18 16:42:52 2012 +0100
@@ -1298,7 +1298,8 @@
 IriSP.PopcornReplacement.roundTime = function() {
   var currentTime = IriSP.PopcornReplacement.currentTime();
   return Math.round(currentTime);
-};/* utils.js - various utils that don't belong anywhere else */
+};
+/* utils.js - various utils that don't belong anywhere else */
 
 /* trace function, for debugging */
 
@@ -4638,22 +4639,23 @@
     /* the next two lines are a bit verbose because for some test data, _serializer.data.view is either
        null or undefined.
     */
-    var view;
-
-    if (typeof(this._data.views) !== "undefined" && this._data.views !== null)
-       view = this._data.views[0];
-
-    var searchViewType = "";
-
-    if(typeof(view) !== "undefined" && typeof(view.annotation_types) !== "undefined" && view.annotation_types.length > 1) {
-            searchViewType = view.annotation_types[0];
+    
+    var searchViewType = this.getTweets();
+    if (typeof(searchViewType) === "undefined") {
+      var view;
+      
+      if (typeof(this._data.views) !== "undefined" && this._data.views !== null)
+         view = this._data.views[0];    
+
+      if(typeof(view) !== "undefined" && typeof(view.annotation_types) !== "undefined" && view.annotation_types.length > 1) {
+              searchViewType = view.annotation_types[0];
+      }
     }
-
     var filterfn = function(annotation) {
       if( searchViewType  != "" && 
           typeof(annotation.meta) !== "undefined" && 
           typeof(annotation.meta["id-ref"]) !== "undefined" &&
-          annotation.meta["id-ref"] !== searchViewType) {
+          annotation.meta["id-ref"] === searchViewType) {
         return false; // pass
       } else {
           return true;