diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 19:15:23 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 19:15:23 +0100 |
commit | b9089fe8d966b48e4c8dc3f06fd365fc506a0199 (patch) | |
tree | 36d04441896a142a69bba884ec6c8d9ba00d10b5 /apps/files/js/files.js | |
parent | 05b46f78281e5df49a5c6a0513a37eaf03c3c29d (diff) | |
parent | 0222c589ac7c006c09dca6cea09cae9a1006a0b4 (diff) | |
download | nextcloud-server-b9089fe8d966b48e4c8dc3f06fd365fc506a0199.tar.gz nextcloud-server-b9089fe8d966b48e4c8dc3f06fd365fc506a0199.zip |
Merge branch 'master' into fixing-1424-master
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r-- | apps/files/js/files.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 7c377afc620..5c5b430a8d4 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -262,12 +262,6 @@ $(document).ready(function() { return; } totalSize+=files[i].size; - if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file - FileList.finishDelete(function(){ - $('#file_upload_start').change(); - }); - return; - } } } if(totalSize>$('#max_upload').val()){ |