wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed drag and drop onto folders

Browse source 
Fixes #5351
This commit is contained in:
Vincent Petry 2013-10-15 15:54:16 +02:00
parent 8c25b5a0c1
commit 92e646413a
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/files/js/filelist.js
View file

@ -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;