From 796e137e82c887da8e67d2ad06b141742f50b98a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 6 Sep 2013 18:51:27 +0200
Subject: [PATCH] fix upload to folder

---
 apps/files/js/filelist.js | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4f20d1940aa..1bb9672f961 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -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;