decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

include annotations that are span the entire in/out, fixes #2538

Browse source
This commit is contained in:
j 2015-02-05 19:04:22 +05:30
parent ed5bc510a9
commit 87d758d997
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
static/js/embedPlayer.js
View file

@ -207,6 +207,8 @@ pandora.ui.embedPlayer = function() {
var items = []; var items = [];
layer.items.forEach(function(item) { layer.items.forEach(function(item) {
if (( if ((
item['in'] < options['in'] && item.out > options.out
) || (
item['in'] >= options['in'] && item['in'] <= options.out item['in'] >= options['in'] && item['in'] <= options.out
) || ( ) || (
item.out >= options['in'] && item.out <= options.out item.out >= options['in'] && item.out <= options.out
@ -216,6 +218,7 @@ pandora.ui.embedPlayer = function() {
}); });
layer.items = items; layer.items = items;
}); });
console.log('!!', video.annotations);
} }
$annotations = Ox.AnnotationPanel(Ox.extend({ $annotations = Ox.AnnotationPanel(Ox.extend({
clickLink: pandora.clickLink, clickLink: pandora.clickLink,
@ -347,7 +350,7 @@ pandora.ui.embedPlayer = function() {
text: subtitle.value.replace(/\n/g, ' ').replace(/<br\/?>/g, '\n'), text: subtitle.value.replace(/\n/g, ' ').replace(/<br\/?>/g, '\n'),
tracks: subtitle.languages || [Ox.getLanguageNameByCode(pandora.site.language)] tracks: subtitle.languages || [Ox.getLanguageNameByCode(pandora.site.language)]
}; };
}) : [] }) : [];
} }
function selectAnnotation(data) { function selectAnnotation(data) {