From 729b2ea771b7ae17a784d9b3b9f00277fcdd4c7e Mon Sep 17 00:00:00 2001 From: j Date: Wed, 30 Nov 2022 19:44:03 +0100 Subject: [PATCH 1/2] use download dialog in player --- static/js/player.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/static/js/player.js b/static/js/player.js index 3ed11e83..aaeb1a4d 100644 --- a/static/js/player.js +++ b/static/js/player.js @@ -84,7 +84,13 @@ pandora.ui.player = function(data) { }), 'clip'); }, downloadvideo: function() { - document.location.href = pandora.getDownloadLink(ui.item, data.rightslevel); + pandora.ui.downloadVideoDialog({ + item: ui.item, + rightsLevel: data.rightsLevel, + source: data.source && pandora.hasCapability('canDownloadSource'), + title: data.title, + video: data.video + }).open(); }, find: function(data) { pandora.UI.set({itemFind: data.find}); From ffc2504c0fd9d04b9eaf81ce25ce6e7d9deae110 Mon Sep 17 00:00:00 2001 From: j Date: Wed, 30 Nov 2022 19:44:15 +0100 Subject: [PATCH 2/2] download via media url --- static/js/downloadVideoDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/downloadVideoDialog.js b/static/js/downloadVideoDialog.js index 9e32cad9..0eb3acac 100644 --- a/static/js/downloadVideoDialog.js +++ b/static/js/downloadVideoDialog.js @@ -128,7 +128,7 @@ pandora.ui.downloadVideoDialog = function(options) { }, function(result) { if (result.data.taskId) { pandora.wait(result.data.taskId, function(result) { - console.log('wait -> ', result) + //console.log('wait -> ', result) if (result.data.result) { url = '/' + options.item + '/' + values.resolution @@ -163,7 +163,7 @@ pandora.ui.downloadVideoDialog = function(options) { } if (url) { that.close(); - document.location.href = url + document.location.href = pandora.getMediaURL(url) } } })