diff options
| author | Oliver Gasser <oliver@flowriver.net> | 2014-08-12 19:32:21 +0200 |
|---|---|---|
| committer | Oliver Gasser <oliver@flowriver.net> | 2014-08-12 19:46:04 +0200 |
| commit | eb2669448dedfb811ff3d6091f9ce8b2cf27b2f8 (patch) | |
| tree | 6ec847a48a29a13892bf73529cf86626f7b7bba1 | |
| parent | 174805f5e35131c891a4b0fa8db3fea3526cfcdb (diff) | |
| download | nextcloud-server-eb2669448dedfb811ff3d6091f9ce8b2cf27b2f8.tar.gz nextcloud-server-eb2669448dedfb811ff3d6091f9ce8b2cf27b2f8.zip | |
Compare upload limit against biggest file
When uploading multiple files from the web interface, compare the PHP
upload limit against the largest file, not against the sum of all files.
| -rw-r--r-- | apps/files/js/file-upload.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 2637d13f9ba..ff999bae4ff 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -233,7 +233,8 @@ OC.Upload = { data.originalFiles.selection = { uploads: [], filesToUpload: data.originalFiles.length, - totalBytes: 0 + totalBytes: 0, + biggestFileBytes: 0 }; } var selection = data.originalFiles.selection; @@ -273,13 +274,15 @@ OC.Upload = { // add size selection.totalBytes += file.size; + // update size of biggest file + selection.biggestFileBytes = Math.max(selection.biggestFileBytes, file.size); - // check PHP upload limit - if (selection.totalBytes > $('#upload_limit').val()) { + // check PHP upload limit against biggest file + if (selection.biggestFileBytes > $('#upload_limit').val()) { data.textStatus = 'sizeexceedlimit'; data.errorThrown = t('files', 'Total file size {size1} exceeds upload limit {size2}', { - 'size1': humanFileSize(selection.totalBytes), + 'size1': humanFileSize(selection.biggestFileBytes), 'size2': humanFileSize($('#upload_limit').val()) }); } |