diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-26 00:14:21 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-26 00:14:21 +0200 |
| commit | de135e3b9bdcb58358b872003fd1e98f51554912 (patch) | |
| tree | c16b0beeb84a6835ff0ebce5d1be1a4d789e8a25 /files/js/fileactions.js | |
| parent | 9d91e53027e0a0c64f36a7eb5812dbe70c6dfaa7 (diff) | |
| parent | 965a8ba2c60eb04e2f65a4ace215113ac61f7c98 (diff) | |
| download | nextcloud-server-de135e3b9bdcb58358b872003fd1e98f51554912.tar.gz nextcloud-server-de135e3b9bdcb58358b872003fd1e98f51554912.zip | |
resolve merge conflicts
Diffstat (limited to 'files/js/fileactions.js')
| -rw-r--r-- | files/js/fileactions.js | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 80e918a455c..975af938440 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -140,7 +140,20 @@ $(document).ready(function(){ }); FileActions.register('all','Delete',function(){return OC.imagePath('core','actions/delete')},function(filename){ - FileList.do_delete(filename); + if(Files.cancelUpload(filename)) { + if(filename.substr){ + filename=[filename]; + } + $.each(filename,function(index,file){ + var filename = $('tr').filterAttr('data-file',file); + filename.hide(); + filename.find('input[type="checkbox"]').removeAttr('checked'); + filename.removeClass('selected'); + }); + procesSelection(); + }else{ + FileList.do_delete(filename); + } }); FileActions.register('all','Rename',function(){return OC.imagePath('core','actions/rename')},function(filename){ |