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

fix upload to folder

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2013-09-06 18:51:27 +02:00
parent e2c0fe8296
commit 796e137e82
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -522,20 +522,7 @@ $(document).ready(function(){
var dropTarget = $(e.originalEvent.target).closest('tr');
if(dropTarget && dropTarget.data('type') === 'dir') { // drag&drop upload to folder
// lookup selection for dir
var selection = OC.Upload.getSelection(data.files);
// remember drop target
selection.dropTarget = dropTarget;
selection.dir = dropTarget.data('file');
if (selection.dir !== '/') {
if ($('#dir').val() === '/') {
selection.dir = '/' + selection.dir;
} else {
selection.dir = $('#dir').val() + '/' + selection.dir;
}
}
var dir = dropTarget.data('file');
// update folder in form
data.formData = function(form) {
@ -545,9 +532,9 @@ $(document).ready(function(){
// array index 2 contains the directory
var parentDir = formArray[2]['value'];
if (parentDir === '/') {
formArray[2]['value'] += selection.dir;
formArray[2]['value'] += dir;
} else {
formArray[2]['value'] += '/' + selection.dir;
formArray[2]['value'] += '/' + dir;
}
return formArray;