diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-19 08:23:07 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-19 08:23:07 -0700 |
| commit | 09cfebe93653f9168bdfb8e480a47c50a28868ea (patch) | |
| tree | 9370b9d5ac99f148d2bc724f76c805b772af7d2d /apps/files/js/fileactions.js | |
| parent | bd5cb1d801a16933b7b75af5c514caec2afa5fef (diff) | |
| parent | 7e0631b3b81a5669620122964d0326ead187de30 (diff) | |
| download | nextcloud-server-09cfebe93653f9168bdfb8e480a47c50a28868ea.tar.gz nextcloud-server-09cfebe93653f9168bdfb8e480a47c50a28868ea.zip | |
Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
file upload conflicts dialog
Diffstat (limited to 'apps/files/js/fileactions.js')
| -rw-r--r-- | apps/files/js/fileactions.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 009ea62de93..67d3d5ead8d 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -177,7 +177,7 @@ $(document).ready(function () { FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () { return OC.imagePath('core', 'actions/delete'); }, function (filename) { - if (Files.cancelUpload(filename)) { + if (OC.Upload.cancelUpload($('#dir').val(), filename)) { if (filename.substr) { filename = [filename]; } |