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

pass pandora.clickLink to Ox.AnnotationPanel in embed views, really fixes #1965

Browse source
This commit is contained in:
j 2013-12-23 14:43:17 +00:00
parent d19050756f
commit bd9f5164b8
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
static/js/embedPlayer.js
View file

@ -135,7 +135,7 @@ pandora.ui.embedPlayer = function() {
+ document.location.hostname + '/' + document.location.hostname + '/'
+ options.item + '/' + options.item + '/'
+ Ox.formatDuration($player.options('position')); + Ox.formatDuration($player.options('position'));
window.open(url, '_blank'); window.top.open(url, '_blank');
}, },
playing: function(data) { playing: function(data) {
setPosition(data.position, true); setPosition(data.position, true);
@ -216,6 +216,7 @@ pandora.ui.embedPlayer = function() {
}); });
} }
$annotations = Ox.AnnotationPanel(Ox.extend({ $annotations = Ox.AnnotationPanel(Ox.extend({
clickLink: pandora.clickLink,
font: options.annotationsFont, font: options.annotationsFont,
layers: video.annotations, layers: video.annotations,
position: options.position, position: options.position,

1
static/js/embedTimeline.js
View file

@ -99,6 +99,7 @@ pandora.ui.embedTimeline = function() {
}); });
} }
$annotations = Ox.AnnotationPanel(Ox.extend({ $annotations = Ox.AnnotationPanel(Ox.extend({
clickLink: pandora.clickLink,
font: options.annotationsFont, font: options.annotationsFont,
layers: video.annotations, layers: video.annotations,
position: options.position, position: options.position,