# HG changeset patch # User hamidouk # Date 1326901348 -3600 # Node ID 324f5fab9eca8e569d6d0f4f5c41757513af11fb # Parent 6fb6d534009af9d72c5eb1ffc41f9656cc8866ac updated player version. diff -r 6fb6d534009a -r 324f5fab9eca src/ldt/ldt/static/ldt/js/LdtPlayer-release.js --- a/src/ldt/ldt/static/ldt/js/LdtPlayer-release.js Wed Jan 18 15:36:26 2012 +0100 +++ b/src/ldt/ldt/static/ldt/js/LdtPlayer-release.js Wed Jan 18 16:42:28 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;