From 87d758d997fa30ce8f335fe6131f71bc8a1820a0 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 5 Feb 2015 19:04:22 +0530 Subject: [PATCH] include annotations that are span the entire in/out, fixes #2538 --- static/js/embedPlayer.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/static/js/embedPlayer.js b/static/js/embedPlayer.js index aa171f5c8..3452a4041 100644 --- a/static/js/embedPlayer.js +++ b/static/js/embedPlayer.js @@ -207,6 +207,8 @@ pandora.ui.embedPlayer = function() { var items = []; layer.items.forEach(function(item) { if (( + item['in'] < options['in'] && item.out > options.out + ) || ( item['in'] >= options['in'] && item['in'] <= options.out ) || ( item.out >= options['in'] && item.out <= options.out @@ -216,6 +218,7 @@ pandora.ui.embedPlayer = function() { }); layer.items = items; }); + console.log('!!', video.annotations); } $annotations = Ox.AnnotationPanel(Ox.extend({ clickLink: pandora.clickLink, @@ -347,7 +350,7 @@ pandora.ui.embedPlayer = function() { text: subtitle.value.replace(/\n/g, ' ').replace(//g, '\n'), tracks: subtitle.languages || [Ox.getLanguageNameByCode(pandora.site.language)] }; - }) : [] + }) : []; } function selectAnnotation(data) {