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

in video view, update URL when selecting annotation (fixes #479)

Browse source
This commit is contained in:
rolux 2012-02-17 16:29:10 +00:00
parent 62c82fceb9
commit 26f368ef84
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
static/js/pandora/item.js
View file

@ -203,6 +203,9 @@ pandora.ui.item = function() {
scale: function(data) { scale: function(data) {
pandora.UI.set('videoScale', data.scale); 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) { subtitles: function(data) {
pandora.UI.set('videoSubtitles', data.subtitles); pandora.UI.set('videoSubtitles', data.subtitles);
}, },
@ -339,16 +342,9 @@ pandora.ui.item = function() {
document.location.href = '/' + pandora.user.ui.item + '/torrent/'; document.location.href = '/' + pandora.user.ui.item + '/torrent/';
}, },
downloadselection: function(data) { downloadselection: function(data) {
document.location.href = [ document.location.href = '/' + pandora.user.ui.item
'/', + '/' + Ox.max(pandora.site.video.resolutions)
pandora.user.ui.item, + 'p.webm?t=' + data['in'] + ',' + data.out;
'/',
Ox.max(pandora.site.video.resolutions),
'p.webm?t=',
data['in'],
',',
data.out
].join('');
}, },
editannotation: function(data) { editannotation: function(data) {
Ox.Log('', 'editAnnotation', data); Ox.Log('', 'editAnnotation', data);