[Pkg-owncloud-commits] [owncloud] 62/394: Revert "fix blocking drag & drop upload of folders"

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 0741598f586a073d713a268b4ae42f8ff3dda5b3
Author: Robin Appelman <icewind at owncloud.com>
Date:   Wed Nov 7 21:59:18 2012 +0100

    Revert "fix blocking drag & drop upload of folders"
    
    Fixes #150
    
    This reverts commit 5b2f3c7f72a002b38da31a6748c0de22cb335203.
---
 apps/files/js/files.js |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index c5333f2..64919ac 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -209,7 +209,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;
@@ -282,7 +282,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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git