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

merging changes

Browse source
This commit is contained in:
rolux 2011-08-18 14:03:08 +00:00
commit e60c606db1
10 changed files with 178 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

12
static/js/pandora/ui/item.js
View file

@ -223,11 +223,11 @@ pandora.ui.item = function() {
var layers = [],
video = result.data.stream,
cuts = result.data.cuts || [],
format = $.support.video.supportedFormat(video.formats),
format = $.support.video.supportedFormat(pandora.site.formats),
streams = {};
video.height = video.resolutions[0];
video.height = pandora.site.resolutions[0];
video.width = parseInt(video.height * video.aspectRatio / 2) * 2;
video.resolutions.forEach(function(resolution) {
pandora.site.resolutions.forEach(function(resolution) {
streams[resolution] = video.baseUrl + '/' + resolution + 'p.' + format;
});
$.each(pandora.site.layers, function(i, layer) {
@ -289,11 +289,11 @@ pandora.ui.item = function() {
var layers = [],
video = result.data.stream,
cuts = result.data.cuts || [],
format = $.support.video.supportedFormat(video.formats),
format = $.support.video.supportedFormat(pandora.site.formats),
streams = {};
video.height = video.resolutions[0];
video.height = pandora.site.resolutions[0];
video.width = parseInt(video.height * video.aspectRatio / 2) * 2;
video.resolutions.forEach(function(resolution) {
pandora.site.resolutions.forEach(function(resolution) {
streams[resolution] = video.baseUrl + '/' + resolution + 'p.' + format;
});
$.each(pandora.site.layers, function(i, layer) {