]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fixed drag and drop onto folders
authorVincent Petry <pvince81@owncloud.com>
Tue, 15 Oct 2013 13:54:16 +0000 (15:54 +0200)
committerVincent Petry <pvince81@owncloud.com>
Tue, 15 Oct 2013 13:59:45 +0000 (15:59 +0200)
Fixes #5351

apps/files/js/filelist.js

index a9297996778c867bc01e71572566436b8d10de30..02de2f2415e75846578b9b65784a5cd7e62800c5 100644 (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;