From e811aad9b94541e05b44b28fa73b0f959cb95c7c Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 25 Feb 2014 22:54:28 +0200 Subject: [PATCH] downloading media files is now done in an iframe --- static/js/main.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/static/js/main.js b/static/js/main.js index b46df8e..d1cb238 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -811,6 +811,17 @@ function endProgress() { }, 500); } +function downloadMediaFile(uri) { + var url = window.location.href; + var parts = url.split('/'); + url = parts.slice(0, 3).join('/') + uri; + + /* download the file by creating a temporary iframe */ + var frame = $(''); + frame.attr('src', url); + $('body').append(frame); +} + /* apply button */ @@ -1238,7 +1249,7 @@ function runPictureDialog(entries, pos, mediaType) { {caption: 'Close'}, {caption: 'Download', isDefault: true, click: function () { var entry = entries[pos]; - window.location.href = '/' + mediaType + '/' + entry.cameraId + '/download' + entry.path; + downloadMediaFile('/' + mediaType + '/' + entry.cameraId + '/download' + entry.path); return false; }} @@ -1568,8 +1579,7 @@ function runMediaDialog(cameraId, mediaType) { entryDiv.append(detailsDiv); downloadButton.click(function () { - window.location.href = '/picture/' + cameraId + '/download' + entry.path; - + downloadMediaFile('/picture/' + cameraId + '/download' + entry.path); return false; }); -- 2.39.5