From 26f368ef846cb2f69710d5b613a003c5fd9c8835 Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 17 Feb 2012 16:29:10 +0000 Subject: [PATCH] in video view, update URL when selecting annotation (fixes #479) --- static/js/pandora/item.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/static/js/pandora/item.js b/static/js/pandora/item.js index 2a7bdfb4e..414c2f419 100644 --- a/static/js/pandora/item.js +++ b/static/js/pandora/item.js @@ -203,6 +203,9 @@ pandora.ui.item = function() { scale: function(data) { pandora.UI.set('videoScale', data.scale); }, + select: function(data) { + pandora.UI.set('videoPoints.' + pandora.user.ui.item + '.annotation', data.id.split('/')[1]); + }, subtitles: function(data) { pandora.UI.set('videoSubtitles', data.subtitles); }, @@ -339,16 +342,9 @@ pandora.ui.item = function() { document.location.href = '/' + pandora.user.ui.item + '/torrent/'; }, downloadselection: function(data) { - document.location.href = [ - '/', - pandora.user.ui.item, - '/', - Ox.max(pandora.site.video.resolutions), - 'p.webm?t=', - data['in'], - ',', - data.out - ].join(''); + document.location.href = '/' + pandora.user.ui.item + + '/' + Ox.max(pandora.site.video.resolutions) + + 'p.webm?t=' + data['in'] + ',' + data.out; }, editannotation: function(data) { Ox.Log('', 'editAnnotation', data);