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

Compare commits

base: 0x2620:ffc2504c0fd9d04b9eaf81ce25ce6e7d9deae110
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:ccbc9662820efd1d923275ffc1092146b78f00ff
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "ffc2504c0fd9d04b9eaf81ce25ce6e7d9deae110" and "ccbc9662820efd1d923275ffc1092146b78f00ff" have entirely different histories.
ffc2504c0f ... ccbc966282

2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/downloadVideoDialog.js
View file

@ -128,7 +128,7 @@ pandora.ui.downloadVideoDialog = function(options) {
}, function(result) { }, function(result) {
if (result.data.taskId) { if (result.data.taskId) {
pandora.wait(result.data.taskId, function(result) { pandora.wait(result.data.taskId, function(result) {
//console.log('wait -> ', result) console.log('wait -> ', result)
if (result.data.result) { if (result.data.result) {
url = '/' + options.item url = '/' + options.item
+ '/' + values.resolution + '/' + values.resolution
@ -163,7 +163,7 @@ pandora.ui.downloadVideoDialog = function(options) {
} }
if (url) { if (url) {
that.close(); that.close();
document.location.href = pandora.getMediaURL(url) document.location.href = url
} }
} }
}) })

8
static/js/player.js
View file

@ -84,13 +84,7 @@ pandora.ui.player = function(data) {
}), 'clip'); }), 'clip');
}, },
downloadvideo: function() { downloadvideo: function() {
pandora.ui.downloadVideoDialog({ document.location.href = pandora.getDownloadLink(ui.item, data.rightslevel);
item: ui.item,
rightsLevel: data.rightsLevel,
source: data.source && pandora.hasCapability('canDownloadSource'),
title: data.title,
video: data.video
}).open();
}, },
find: function(data) { find: function(data) {
pandora.UI.set({itemFind: data.find}); pandora.UI.set({itemFind: data.find});