open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix blocking drag & drop upload of folders

Browse Source
remotes/origin/stable5
Robin Appelman 13 years ago
parent c099545b6d
commit 5b2f3c7f72
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      apps/files/js/files.js

4
apps/files/js/files.js
Unescape View File

@ -209,7 +209,7 @@ $(document).ready(function() {
var totalSize=0; var totalSize=0;
if(files){ if(files){
for(var i=0;i<files.length;i++){ 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')); OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
return; return;
@ -282,7 +282,7 @@ $(document).ready(function() {
var fileName = files[i].name var fileName = files[i].name
var dropTarget = $(e.originalEvent.target).closest('tr'); var dropTarget = $(e.originalEvent.target).closest('tr');
if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder 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], var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i],
formData: function(form) { formData: function(form) {
var formArray = form.serializeArray(); var formArray = form.serializeArray();

Write Preview
Loading…
Cancel
Save