aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/fileactions.js
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-01-29 10:55:44 +0100
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-01-29 10:55:44 +0100
commit13ed59c1cf2598f28c415c0c2459b5a4495ff5ef (patch)
tree890efcfe462f19468e2aa05ca1a22049edc21ab6 /apps/files/js/fileactions.js
parentc767ebcc03c604f3141af4c286ad099fdf64c561 (diff)
parentcf2c061f1f2577b3a995d9e2423c93589d7df2b3 (diff)
downloadnextcloud-server-13ed59c1cf2598f28c415c0c2459b5a4495ff5ef.tar.gz
nextcloud-server-13ed59c1cf2598f28c415c0c2459b5a4495ff5ef.zip
merge master into mobile-style
Diffstat (limited to 'apps/files/js/fileactions.js')
-rw-r--r--apps/files/js/fileactions.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 74bb711ef3d..eb59e71a030 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -173,7 +173,10 @@ $(document).ready(function () {
FileActions.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
return OC.imagePath('core', 'actions/download');
}, function (filename) {
- window.location = OC.filePath('files', 'ajax', 'download.php') + '?files=' + encodeURIComponent(filename) + '&dir=' + encodeURIComponent($('#dir').val());
+ var url = FileList.getDownloadUrl(filename);
+ if (url) {
+ OC.redirect(url);
+ }
});
}
$('#fileList tr').each(function () {