From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 7 Nov 2012 20:59:18 +0000 (+0100)
Subject: Revert "fix blocking drag & drop upload of folders"
X-Git-Tag: v5.0.0alpha1~486
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e14054610f3dcb672370158da87f4db3c0e43552;p=nextcloud-server.git

Revert "fix blocking drag & drop upload of folders"

Fixes #150

This reverts commit 5b2f3c7f72a002b38da31a6748c0de22cb335203.
---

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 16f7c966067..e54d4d7b74f 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -201,7 +201,7 @@ $(document).ready(function() {
 				var totalSize=0;
 				if(files){
 					for(var i=0;i<files.length;i++){
-						if(files[i].size ==0 || files[i].type== '')
+						if(files[i].size ==0 && files[i].type== '')
 						{
 							OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
 							return;
@@ -274,7 +274,7 @@ $(document).ready(function() {
 							var fileName = files[i].name
 							var dropTarget = $(e.originalEvent.target).closest('tr');
 							if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
-								var dirName = dropTarget.attr('data-file');
+								var dirName = dropTarget.attr('data-file')
 								var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i],
 										formData: function(form) {
 											var formArray = form.serializeArray();