diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-01 22:57:46 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-01 22:57:46 +0200 |
| commit | 9eab8b39df34b507530b0beceb31eb23fbea54f5 (patch) | |
| tree | 6b53d3f1b9aabd9d62092f1ad7b2568bd55b5c51 /apps/files_sharing/js/public.js | |
| parent | ce58c32c901fb874264922dabec1692f9d05123d (diff) | |
| parent | 5ade595911261cf47cdad17deb4d1a013f523245 (diff) | |
| download | nextcloud-server-9eab8b39df34b507530b0beceb31eb23fbea54f5.tar.gz nextcloud-server-9eab8b39df34b507530b0beceb31eb23fbea54f5.zip | |
Merge branch 'master' into fixing-4620-master
Diffstat (limited to 'apps/files_sharing/js/public.js')
| -rw-r--r-- | apps/files_sharing/js/public.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index acabc9a5c10..67320b1cdb6 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -62,6 +62,9 @@ $(document).ready(function() { $('#controls').append($('#additional_controls div#uploadprogresswrapper')); // Cancel upload trigger - $('#cancel_upload_button').click(Files.cancelUploads); + $('#cancel_upload_button').click(function() { + OC.Upload.cancelUploads(); + procesSelection(); + }); }); |