Extend

JanAckermann · JanAckermann · commit fefce06c94df · 2021-09-24T15:04:59.000+02:00
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
@@ -214,7 +214,7 @@ OC.FileUpload.prototype = {
 		var file = this.getFile();
 
 		if(file.isDirectory){
-			return this.uploader.ensureFolderExists(OC.joinPaths(this._targetFolder, file.name));
+			return this.uploader.ensureFolderExists(OC.joinPaths(this._targetFolder, file.fullPath));
 		}
 
 		// it was a folder upload, so make sure the parent directory exists already
@@ -226,7 +226,6 @@ OC.FileUpload.prototype = {
 			folderPromise = $.Deferred().resolve().promise();
 		}
 
-		console.log("LOL");
 		if (this.uploader.url) {
 			if (_.isFunction(this.uploader.url)) {
 				this.data.url = this.uploader.url(this.getFileName(), this.getFullPath());
@@ -596,8 +595,6 @@ OC.Uploader.prototype = _.extend({
 	 * were created
 	 */
 	ensureFolderExists: function(fullPath) {
-		console.log("!!!");
-		console.log(fullPath);
 		if (!fullPath || fullPath === '/') {
 			return $.Deferred().resolve().promise();
 		}
@@ -627,9 +624,7 @@ OC.Uploader.prototype = _.extend({
 				parentPromise = this.ensureFolderExists(parentPath);
 			}
 
-			console.log(fullPath);
 			parentPromise.then(function() {
-				console.log("====?");
 				self.filesClient.createDirectory(fullPath).always(function(status) {
 					// 405 is expected if the folder already exists
 					if ((status >= 200 && status < 300) || status === 405) {
diff --git a/apps/files/js/jquery.fileupload.js b/apps/files/js/jquery.fileupload.js
@@ -1079,7 +1079,14 @@
             } 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];
