summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/js/files.js5
-rw-r--r--apps/files/templates/index.php1
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a2d17fae7d2..4010c66593f 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -115,6 +115,11 @@ $(document).ready(function() {
return false;
});
+ // Trigger cancelling of file upload
+ $('#uploadprogresswrapper stop').on('click', function() {
+ Files.cancelUploads();
+ });
+
// Show trash bin
$('#trash a').live('click', function() {
window.location=OC.filePath('files_trashbin', '', 'index.php');
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 69fcb94e681..66866ee8b43 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -46,7 +46,6 @@
<div id="uploadprogressbar"></div>
<input type="button" class="stop" style="display:none"
value="<?php p($l->t('Cancel upload'));?>"
- onclick="javascript:Files.cancelUploads();"
/>
</div>
</div>