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

user video player rewind option

Browse source
This commit is contained in:
rolux 2011-10-03 10:58:47 +00:00
parent 72db2e188d
commit 99abbb827e
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/user/views.py
View file

@ -367,7 +367,7 @@ def order_query(qs, sort):
}.get(e['key'], 'profile__%s'%e['key']) }.get(e['key'], 'profile__%s'%e['key'])
if key == 'profile__numberoflists': if key == 'profile__numberoflists':
qs = qs.annotate(numberoflists=Sum('lists')) qs = qs.annotate(numberoflists=Sum('lists'))
key = 'numberoffiles' key = 'numberoflists'
order = '%s%s' % (operator, key) order = '%s%s' % (operator, key)
order_by.append(order) order_by.append(order)
if order_by: if order_by:

7
static/js/pandora/ui/clipList.js
View file

@ -5,7 +5,6 @@ pandora.ui.clipList = function(videoRatio) {
var ui = pandora.user.ui, var ui = pandora.user.ui,
fixedRatio = !ui.item ? 16/9 : videoRatio, fixedRatio = !ui.item ? 16/9 : videoRatio,
isClipView = !ui.item ? ui.listView == 'clip' : ui.itemView == 'clips', isClipView = !ui.item ? ui.listView == 'clip' : ui.itemView == 'clips',
$selectedVideo,
that = Ox.IconList({ that = Ox.IconList({
fixedRatio: fixedRatio, fixedRatio: fixedRatio,
@ -138,6 +137,7 @@ pandora.ui.clipList = function(videoRatio) {
paused: true, paused: true,
playInToOut: true, playInToOut: true,
poster: '/' + item + '/' + height + 'p' + points[0] + '.jpg', poster: '/' + item + '/' + height + 'p' + points[0] + '.jpg',
rewind: true,
width: width, width: width,
video: partsAndPoints.parts.map(function(i) { video: partsAndPoints.parts.map(function(i) {
return '/' + item + '/96p' + (i + 1) return '/' + item + '/96p' + (i + 1)
@ -154,7 +154,6 @@ pandora.ui.clipList = function(videoRatio) {
$img.replaceWith($player.$element); $img.replaceWith($player.$element);
$('.OxSelectedVideo').removeClass('OxSelectedVideo'); $('.OxSelectedVideo').removeClass('OxSelectedVideo');
$player.$element.addClass('OxSelectedVideo'); $player.$element.addClass('OxSelectedVideo');
$selectedVideo = $player;
}); });
} else if ($video.length) { } else if ($video.length) {
// item select fires before video click // item select fires before video click
@ -164,15 +163,11 @@ pandora.ui.clipList = function(videoRatio) {
setTimeout(function() { setTimeout(function() {
$('.OxSelectedVideo').removeClass('OxSelectedVideo'); $('.OxSelectedVideo').removeClass('OxSelectedVideo');
$video.addClass('OxSelectedVideo'); $video.addClass('OxSelectedVideo');
$selectedVideo = $video;
}, 300); }, 300);
} }
!ui.item && pandora.UI.set('listSelection', [item]); !ui.item && pandora.UI.set('listSelection', [item]);
} else { } else {
$('.OxSelectedVideo').removeClass('OxSelectedVideo'); $('.OxSelectedVideo').removeClass('OxSelectedVideo');
$selectedVideo && $selectedVideo.options({
position: $selectedVideo.options('in')
});
!ui.item && pandora.UI.set('listSelection', []); !ui.item && pandora.UI.set('listSelection', []);
} }
} }