diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/file-upload.js | 15 | ||||
| -rw-r--r-- | apps/files/js/files.js | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 8fec7d5c04e..18d0d973586 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -769,8 +769,7 @@ OC.Uploader.prototype = _.extend({ data.originalFiles.selection = { uploads: [], filesToUpload: data.originalFiles.length, - totalBytes: 0, - biggestFileBytes: 0 + totalBytes: 0 }; } // TODO: move originalFiles to a separate container, maybe inside OC.Upload @@ -825,18 +824,6 @@ OC.Uploader.prototype = _.extend({ } else { // add size selection.totalBytes += file.size; - // update size of biggest file - selection.biggestFileBytes = Math.max(selection.biggestFileBytes, file.size); - } - - // 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.biggestFileBytes), - 'size2': humanFileSize($('#upload_limit').val()) - }); } // check free space diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 0be098b2e73..1681e2c7e48 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -59,7 +59,6 @@ return; } if (response.data !== undefined && response.data.uploadMaxFilesize !== undefined) { - $('#max_upload').val(response.data.uploadMaxFilesize); $('#free_space').val(response.data.freeSpace); $('#upload.button').attr('data-original-title', response.data.maxHumanFilesize); $('#usedSpacePercent').val(response.data.usedSpacePercent); @@ -71,7 +70,6 @@ return; } if (response[0].uploadMaxFilesize !== undefined) { - $('#max_upload').val(response[0].uploadMaxFilesize); $('#upload.button').attr('data-original-title', response[0].maxHumanFilesize); $('#usedSpacePercent').val(response[0].usedSpacePercent); Files.displayStorageWarnings(); |