diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-25 16:36:58 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-25 16:36:58 +0100 |
| commit | ea8f71a19c59e7138d4a504bacc0beb410fc77e8 (patch) | |
| tree | 5c4da1ddafb6d81feb90d3a70e927e59dc0a5e0d /files | |
| parent | 814bc2fd2bef739938716ae840a4db0de502422a (diff) | |
| parent | 8b93a9a237603185501d0e24e9c08705168fc553 (diff) | |
| download | nextcloud-server-ea8f71a19c59e7138d4a504bacc0beb410fc77e8.tar.gz nextcloud-server-ea8f71a19c59e7138d4a504bacc0beb410fc77e8.zip | |
Merge branch 'master' into encryption
Diffstat (limited to 'files')
| -rw-r--r-- | files/js/files.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/files/js/files.js b/files/js/files.js index bebcf4e97a4..9f1f5368df0 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -166,6 +166,7 @@ $(document).ready(function() { $('.file_upload_start').live('change',function(){ var form=$(this).closest('form'); + var that=this; var uploadId=form.attr('data-upload-id'); var files=this.files; var target=form.children('iframe'); @@ -173,6 +174,12 @@ $(document).ready(function() { if(files){ for(var i=0;i<files.length;i++){ 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(){ + $(that).change(); + }); + return; + } } } if(totalSize>$('#max_upload').val()){ |