diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2014-03-11 10:29:08 +0100 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-03-11 10:29:08 +0100 |
| commit | d290f44fc74805a6e2c0c5f0a565b3c7fa056597 (patch) | |
| tree | 7b698774ff830ae9cf6e4b720bd7a78121720ab6 /apps/files/js/files.js | |
| parent | 4966d632ae6e2c780e327bed0d94145b5161d554 (diff) | |
| parent | b4c10eea607c97d805bb658438df8f82487986b4 (diff) | |
| download | nextcloud-server-d290f44fc74805a6e2c0c5f0a565b3c7fa056597.tar.gz nextcloud-server-d290f44fc74805a6e2c0c5f0a565b3c7fa056597.zip | |
Merge pull request #7608 from owncloud/stable6-publicpagedownloadall
[stable6] Fixed "select all" + download on public page
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 2f4b74749de..aee0fe26d6c 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -361,7 +361,12 @@ $(document).ready(function() { // use special download URL if provided, e.g. for public shared files var downloadURL = document.getElementById("downloadURL"); if ( downloadURL ) { - window.location = downloadURL.value+"&download&files=" + encodeURIComponent(fileslist); + // downloading all in root of public share ? (replacement for old "Download" button) + if ($('#isPublic').val() && dir === '/' && $('#select_all').is(':checked')) { + window.location = downloadURL.value; + } else { + window.location = downloadURL.value+"&download&files=" + encodeURIComponent(fileslist); + } } else { window.location = OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: fileslist }); } |