diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 17:28:30 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 17:28:30 +0100 |
commit | d67d9566ce37e63c4df62d1f57fb03540421895c (patch) | |
tree | 5b6d5d0002f962f04c4706b3a722991a8e68c6ab /apps/files/js/files.js | |
parent | 9dddcae9ca3dcf872893e36e2f478ebecafdc6e2 (diff) | |
parent | 5a309c11ca90589303c38084795432d3d23e393d (diff) | |
download | nextcloud-server-d67d9566ce37e63c4df62d1f57fb03540421895c.tar.gz nextcloud-server-d67d9566ce37e63c4df62d1f57fb03540421895c.zip |
Merge branch 'master' into clean-app-id
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()){ |