upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #29597 from nextcloud/backport/29592/stable22

Browse source
This commit is contained in:
John Molakvoæ 2021-11-08 20:58:14 +01:00 committed by GitHub
commit eb585597bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files/js/file-upload.js
View file

@ -215,6 +215,12 @@ OC.FileUpload.prototype = {
var data = this.data;
var file = this.getFile();
// if file is a directory, just create it
// files are handled separately
if (file.isDirectory) {
return this.uploader.ensureFolderExists(OC.joinPaths(this._targetFolder, file.fullPath));
}
if (self.aborted === true) {
return $.Deferred().resolve().promise();
}

16
apps/files/js/jquery.fileupload.js vendored
View file

@ -1029,7 +1029,12 @@
} else {
paramNameSet = paramName;
}
data.originalFiles = files;
data.originalFiles = [];
$.each(files, function (file) {
if (!file.isDirectory) {
data.originalFiles.push(file);
}
});
$.each(fileSet || files, function (index, element) {
var newData = $.extend({}, data);
newData.files = fileSet ? element : [element];
@ -1098,7 +1103,12 @@
entries,
path + entry.name + '/'
).done(function (files) {
dfd.resolve(files);
// empty folder
if (!files.length && entry.isDirectory) {
dfd.resolve(entry);
} else {
dfd.resolve(files);
}
}).fail(errorHandler);
},
readEntries = function () {
@ -1486,4 +1496,4 @@
});
}));
}));