diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-03 01:47:40 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-03 01:47:40 +0200 |
| commit | 627090265026fd9d09a8c903ff3600dc8311bd8c (patch) | |
| tree | cf3d3d964f12123f3195e4358a7b65ec3d41a83c /apps/files/js | |
| parent | f12a5248a3ee4fd71ade32580afdf0455fbc6764 (diff) | |
| parent | da090099f414ad4f0163ddfd21f1560f897f58d4 (diff) | |
| download | nextcloud-server-627090265026fd9d09a8c903ff3600dc8311bd8c.tar.gz nextcloud-server-627090265026fd9d09a8c903ff3600dc8311bd8c.zip | |
Merge pull request #8821 from owncloud/kill-zip-download-restriction
drop allowZIPdownload and maxZIPSize as options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/admin.js | 8 | ||||
| -rw-r--r-- | apps/files/js/fileactions.js | 8 |
2 files changed, 1 insertions, 15 deletions
diff --git a/apps/files/js/admin.js b/apps/files/js/admin.js index 842b73c0cae..dcfec824cfe 100644 --- a/apps/files/js/admin.js +++ b/apps/files/js/admin.js @@ -25,12 +25,4 @@ $(document).ready(function() { // To get rid of onClick() switchPublicFolder(); }); - - $('#allowZipDownload').bind('change', function() { - if($('#allowZipDownload').attr('checked')) { - $('#maxZipInputSize').removeAttr('disabled'); - } else { - $('#maxZipInputSize').attr('disabled', 'disabled'); - } - }); }); diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 3df62f37518..de02bf5e730 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -275,14 +275,8 @@ }); this.setDefault('dir', 'Open'); - var downloadScope; - if ($('#allowZipDownload').val() == 1) { - downloadScope = 'all'; - } else { - downloadScope = 'file'; - } - this.register(downloadScope, 'Download', OC.PERMISSION_READ, function () { + this.register('all', 'Download', OC.PERMISSION_READ, function () { return OC.imagePath('core', 'actions/download'); }, function (filename, context) { var dir = context.dir || context.fileList.getCurrentDirectory(); |