Move onclick handler

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a2d17fae7d2f48d207f4eb74ac07d957fe272834..4010c66593fc9827ea4eb0630e13b4c4a579aa4c 100644 (file)
--- 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 69fcb94e68197d05ced7d9dc9c4788c8e3a406c4..66866ee8b43199322d3351fb9691377b79e970c6 100644 (file)
--- 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>