diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-09 17:53:57 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-09 17:53:57 +0200 |
| commit | 926b3c9b7be2c3f0d71a64a60006d373f689da39 (patch) | |
| tree | 20957e2f0454879f73da01d0dea131cb702f3632 /apps/files/js/fileactions.js | |
| parent | 48b5c1d5f934fb4f6c58bf196b81ee8089217e52 (diff) | |
| parent | 223adc3167d82d8bcd88b19aae78b1da2773e729 (diff) | |
| download | nextcloud-server-926b3c9b7be2c3f0d71a64a60006d373f689da39.tar.gz nextcloud-server-926b3c9b7be2c3f0d71a64a60006d373f689da39.zip | |
Merge branch 'master' into activities-api
Diffstat (limited to 'apps/files/js/fileactions.js')
| -rw-r--r-- | apps/files/js/fileactions.js | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 67d3d5ead8d..e14e52eb6ca 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -177,20 +177,7 @@ $(document).ready(function () { FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () { return OC.imagePath('core', 'actions/delete'); }, function (filename) { - if (OC.Upload.cancelUpload($('#dir').val(), 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); - } + FileList.do_delete(filename); $('.tipsy').remove(); }); |