From bd9f5164b8c3f43cb06dff51d228903aeb623bff Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Mon, 23 Dec 2013 14:43:17 +0000 Subject: [PATCH] pass pandora.clickLink to Ox.AnnotationPanel in embed views, really fixes #1965 --- static/js/embedPlayer.js | 3 ++- static/js/embedTimeline.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/static/js/embedPlayer.js b/static/js/embedPlayer.js index 81404e0f3..659115ae0 100644 --- a/static/js/embedPlayer.js +++ b/static/js/embedPlayer.js @@ -135,7 +135,7 @@ pandora.ui.embedPlayer = function() { + document.location.hostname + '/' + options.item + '/' + Ox.formatDuration($player.options('position')); - window.open(url, '_blank'); + window.top.open(url, '_blank'); }, playing: function(data) { setPosition(data.position, true); @@ -216,6 +216,7 @@ pandora.ui.embedPlayer = function() { }); } $annotations = Ox.AnnotationPanel(Ox.extend({ + clickLink: pandora.clickLink, font: options.annotationsFont, layers: video.annotations, position: options.position, diff --git a/static/js/embedTimeline.js b/static/js/embedTimeline.js index 8343edc4d..d7f72a5d2 100644 --- a/static/js/embedTimeline.js +++ b/static/js/embedTimeline.js @@ -99,6 +99,7 @@ pandora.ui.embedTimeline = function() { }); } $annotations = Ox.AnnotationPanel(Ox.extend({ + clickLink: pandora.clickLink, font: options.annotationsFont, layers: video.annotations, position: options.position,