From 8e27b725ba2aa26cb9037b44b18ff800649017b1 Mon Sep 17 00:00:00 2001
From: Simon Birnbach <simon@simon-birnbach.de>
Date: Sun, 15 Apr 2012 16:47:53 +0200
Subject: Fixed cancelling upload of same file to folder and subfolder

---
 files/js/files.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'files/js/files.js')

diff --git a/files/js/files.js b/files/js/files.js
index 89101ce4b8f..a7a4d3077c1 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -172,6 +172,7 @@ $(document).ready(function() {
 	});
 
 	// drag&drop support using jquery.fileupload
+	// TODO use OC.dialogs
 	$(document).bind('drop dragover', function (e) {
 			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
 	});
@@ -242,6 +243,7 @@ $(document).ready(function() {
 									$('#notification').fadeIn();
 								}
 							});
+							uploadingFiles[dirName+"/"+files[i].name] = jqXHR;
 						} else {
 							var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i]})
 									.success(function(result, textStatus, jqXHR) {
@@ -270,8 +272,8 @@ $(document).ready(function() {
 									$('#notification').fadeIn();
 								}
 							});
+							uploadingFiles[files[i].name] = jqXHR;
 						}
-						uploadingFiles[files[i].name] = jqXHR;
 					}
 				}else{
 					data.submit().success(function(data, status) {
-- 
cgit v1.2.3