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

cleanup video url construction, add uid to prefix

Browse source
This commit is contained in:
j 2012-03-03 14:56:35 +01:00
commit ab2c8f7d0f
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
static/js/pandora/utils.js
View file

@ -792,6 +792,13 @@ pandora.getSortOperator = function(key) {
) > -1 ? '+' : '-';
};
pandora.getVideoUrl = function(id, resolution, part) {
var pandora.site.site.videoprefix
.replace('{uid}', Ox.uid())
.replace('{part}', part);
return prefix + '/' + id + '/' + resolution + 'p' + part + '.' + pandora.user.videoFormat;
}
pandora.getVideoOptions = function(data) {
var canPlayClips = data.editable || pandora.site.capabilities.canPlayClips[pandora.user.level] >= data.rightslevel,
canPlayVideo = data.editable || pandora.site.capabilities.canPlayVideo[pandora.user.level] >= data.rightslevel,
@ -828,10 +835,7 @@ pandora.getVideoOptions = function(data) {
options.video = {};
pandora.site.video.resolutions.forEach(function(resolution) {
options.video[resolution] = Ox.range(data.parts).map(function(i) {
var part = (i + 1),
prefix = pandora.site.site.videoprefix.replace('{part}', part);
return prefix + '/' + (data.item || pandora.user.ui.item) + '/'
+ resolution + 'p' + part + '.' + pandora.user.videoFormat;
return pandora.getVideoUrl(data.item || pandora.user.ui.item, resolution, i + 1);
});
});
options.layers = [];