From 6cf6103ed2d8fcb70d5340be583622f32ff08913 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 28 Apr 2013 23:25:58 +0200 Subject: [PATCH 1/3] Move onclick handler --- apps/files/js/files.js | 5 +++++ apps/files/templates/index.php | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) 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 @@
From 003e6adb3fbd1a683d986c752affc924cc032902 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 28 Apr 2013 23:26:07 +0200 Subject: [PATCH 2/3] Remove uneeded onclick handler --- apps/files/templates/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 66866ee8b43..b576253f4f0 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -34,7 +34,7 @@ value="(max )"> - + From 3a6e39b990b1e58d03cc81479a8a27b6ad6c74fe Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 28 Apr 2013 23:28:41 +0200 Subject: [PATCH 3/3] It's a class --- apps/files/js/files.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 4010c66593f..296e54e3568 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -116,7 +116,7 @@ $(document).ready(function() { }); // Trigger cancelling of file upload - $('#uploadprogresswrapper stop').on('click', function() { + $('#uploadprogresswrapper .stop').on('click', function() { Files.cancelUploads(); });