From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Oct 2013 13:54:16 +0000 (+0200)
Subject: Fixed drag and drop onto folders
X-Git-Tag: v6.0.0beta2~105^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=92e646413a8b2df3c16306b75deab506b6eb4ec2;p=nextcloud-server.git

Fixed drag and drop onto folders

Fixes #5351
---

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index a9297996778..02de2f2415e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -698,11 +698,23 @@ $(document).ready(function(){
 				// array index 0 contains the max files size
 				// array index 1 contains the request token
 				// array index 2 contains the directory
-				var parentDir = formArray[2]['value'];
-				if (parentDir === '/') {
-					formArray[2]['value'] += dir;
-				} else {
-					formArray[2]['value'] += '/' + dir;
+				if (formArray.length){
+					var parentDir = formArray[2]['value'];
+					if (parentDir === '/') {
+						formArray[2]['value'] += dir;
+					} else {
+						formArray[2]['value'] += '/' + dir;
+					}
+				}
+				else{
+					var parentDir = $('#dir').val() || '';
+					if (parentDir[parentDir.length - 1] != '/'){
+						parentDir += '/';
+					}
+					return [
+						{name: 'dir', value: parentDir + dir},
+						{name: 'requesttoken', value: oc_requesttoken}
+					];
 				}
 
 				return formArray;