Show message if upload of folder isn't allowed

* current firefox doesn't throw an exception anymore
	* it just reads 0 bytes -> folder or empty file
* upload of folder or empty file isn't supported in every
  browser except Chrome
* fixes #13940

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 7374a4c90f3858136a57faccabde11cd4b59ad4e..bc3e59a11af6f8996527b1a623685a0a731576ff 100644 (file)
--- 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',