diff options
| author | Simon Birnbach <simon@simon-birnbach.de> | 2012-04-15 16:47:53 +0200 |
|---|---|---|
| committer | Simon Birnbach <simon@simon-birnbach.de> | 2012-04-15 16:47:53 +0200 |
| commit | 8e27b725ba2aa26cb9037b44b18ff800649017b1 (patch) | |
| tree | deff0a6c3a4ada98ccc506e8c20f464a015dd9b9 /files/js | |
| parent | a384fcb99fc3a12d7dac937398bf827c79e86098 (diff) | |
| download | nextcloud-server-8e27b725ba2aa26cb9037b44b18ff800649017b1.tar.gz nextcloud-server-8e27b725ba2aa26cb9037b44b18ff800649017b1.zip | |
Fixed cancelling upload of same file to folder and subfolder
Diffstat (limited to 'files/js')
| -rw-r--r-- | files/js/files.js | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |