0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

clip list: handle embed case, use min resolution

Browse source
This commit is contained in:
rolux 2013-03-01 11:22:24 +00:00
parent 3efd918424
commit 0dbb327a97
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
static/js/pandora/clipList.js
View file

@ -9,6 +9,7 @@ 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',
isEmbed = pandora.isEmbedURL(),
that = Ox.IconList({ that = Ox.IconList({
find: !ui.item ? pandora.getItemFind(ui.find) : ui.itemFind, find: !ui.item ? pandora.getItemFind(ui.find) : ui.itemFind,
fixedRatio: fixedRatio, fixedRatio: fixedRatio,
@ -104,7 +105,7 @@ pandora.ui.clipList = function(videoRatio) {
!ui.item ? ['videoRatio'] : [] !ui.item ? ['videoRatio'] : []
), ),
max: 1, max: 1,
orientation: 'both', orientation: isEmbed && !isClipView ? 'horizontal' : 'both',
size: 128, size: 128,
sort: !ui.item ? ui.listSort : ui.itemSort, sort: !ui.item ? ui.listSort : ui.itemSort,
unique: 'id' unique: 'id'
@ -182,7 +183,7 @@ pandora.ui.clipList = function(videoRatio) {
poster: '/' + item + '/' + height + 'p' + points[0] + '.jpg', poster: '/' + item + '/' + height + 'p' + points[0] + '.jpg',
rewind: true, rewind: true,
video: partsAndPoints.parts.map(function(i) { video: partsAndPoints.parts.map(function(i) {
return pandora.getVideoUrl(item, 96, i + 1); return pandora.getVideoURL(item, Ox.min(pandora.site.video.resolutions), i + 1);
}), }),
width: width width: width
}) })
@ -218,11 +219,11 @@ pandora.ui.clipList = function(videoRatio) {
//*/ //*/
} }
!ui.item && pandora.UI.set('listSelection', [item]); !ui.item && pandora.UI.set('listSelection', [item]);
pandora.$ui.mainMenu.enableItem('findsimilar'); !isEmbed && pandora.$ui.mainMenu.enableItem('findsimilar');
} else { } else {
$('.OxSelectedVideo').removeClass('OxSelectedVideo'); $('.OxSelectedVideo').removeClass('OxSelectedVideo');
!ui.item && pandora.UI.set('listSelection', []); !ui.item && pandora.UI.set('listSelection', []);
pandora.$ui.mainMenu.disableItem('findsimilar'); !isEmbed && pandora.$ui.mainMenu.disableItem('findsimilar');
} }
}, },
pandora_itemsort: function(data) { pandora_itemsort: function(data) {