diff options
Diffstat (limited to 'apps/files/js/file-upload.js')
| -rw-r--r-- | apps/files/js/file-upload.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 4e0b9e0e6d1..ce8127c9887 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -266,11 +266,20 @@ OC.Upload = { // in case folder drag and drop is not supported file will point to a directory // http://stackoverflow.com/a/20448357 if ( ! file.type && file.size%4096 === 0 && file.size <= 102400) { + var dirUploadFailure = false; try { var reader = new FileReader(); reader.readAsBinaryString(file); } catch (NS_ERROR_FILE_ACCESS_DENIED) { //file is a directory + dirUploadFailure = true; + } + if (file.size === 0) { + // file is empty or a directory + dirUploadFailure = true; + } + + if (dirUploadFailure) { data.textStatus = 'dirorzero'; data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes', @@ -587,7 +596,7 @@ OC.Upload = { // add input field var form = $('<form></form>'); - var input = $('<input type="text" placeholder="https://…">'); + var input = $('<input type="text">'); var newName = $(this).attr('data-newname') || ''; var fileType = 'input-' + $(this).attr('data-type'); if (newName) { |