From 92e646413a8b2df3c16306b75deab506b6eb4ec2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Oct 2013 15:54:16 +0200
Subject: [PATCH] Fixed drag and drop onto folders
Fixes #5351
---
apps/files/js/filelist.js | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index a929799677..02de2f2415 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;
--
GitLab