summaryrefslogtreecommitdiffstats
path: root/apps/files/js/file-upload.js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-06-18 20:38:51 +0200
committerVincent Petry <pvince81@owncloud.com>2014-06-19 16:14:10 +0200
commit9ef7410abe282e2a81a9cd41672574a74282e4c3 (patch)
treeb1a0fe6b1a2724eab86f65fb3f859194b2788036 /apps/files/js/file-upload.js
parenta921ad89259f1d580292d649a58160fab7a2a2d7 (diff)
downloadnextcloud-server-9ef7410abe282e2a81a9cd41672574a74282e4c3.tar.gz
nextcloud-server-9ef7410abe282e2a81a9cd41672574a74282e4c3.zip
Fixed uploading by drag and drop into folder
Diffstat (limited to 'apps/files/js/file-upload.js')
-rw-r--r--apps/files/js/file-upload.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 6b0ca793681..da58e1c31b8 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -346,7 +346,7 @@ OC.Upload = {
// noone set update parameters, we set the minimum
data.formData = {
requesttoken: oc_requesttoken,
- dir: FileList.getCurrentDirectory(),
+ dir: data.targetDir || FileList.getCurrentDirectory(),
file_directory: fileDirectory
};
}