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

no upscaling, uploadUrl has to be https

Browse source
This commit is contained in:
j 2012-03-17 02:06:49 +01:00
parent d3a2f42a64
commit 84e6cfdec3
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
static/js/pandora/upload.js
View file

@ -43,6 +43,9 @@ pandora.ui.upload = function(oshash, file) {
maxRetry = response.maxRetry; maxRetry = response.maxRetry;
} }
chunkUrl = response.uploadUrl; chunkUrl = response.uploadUrl;
if (document.location.protocol == 'https:') {
chunkUrl = chunkUrl.replace(/http:\/\//, 'https://');
}
if (chunkUrl) { if (chunkUrl) {
that.status = 'uploading'; that.status = 'uploading';
that.progress = 0.0; that.progress = 0.0;

2
static/js/pandora/uploadDialog.js
View file

@ -281,7 +281,7 @@ pandora.ui.uploadDialog = function(data) {
options.noUpscaling = true; options.noUpscaling = true;
if((!info.video.length || (info.video[0].codec == options.videoCodec if((!info.video.length || (info.video[0].codec == options.videoCodec
&& info.video[0].height == options.height)) && info.video[0].height <= options.height))
&& (!info.audio.length || info.audio[0].codec == options.audioCodec)) { && (!info.audio.length || info.audio[0].codec == options.audioCodec)) {
options = { options = {
passthrough: true passthrough: true