diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-04-29 03:58:44 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-04-29 03:58:44 -0700 |
| commit | cc9933be1cf3176747dc07c7bedb3228d8a99b29 (patch) | |
| tree | e820d351c46fe64354889aab9cdf820ef4afa1e9 | |
| parent | 2b36ad292dcbfd8b714b028b71e2c42c622aa7d4 (diff) | |
| parent | 3a6e39b990b1e58d03cc81479a8a27b6ad6c74fe (diff) | |
| download | nextcloud-server-cc9933be1cf3176747dc07c7bedb3228d8a99b29.tar.gz nextcloud-server-cc9933be1cf3176747dc07c7bedb3228d8a99b29.zip | |
Merge pull request #3160 from owncloud/remove-onclick
Remove onclick
| -rw-r--r-- | apps/files/js/files.js | 5 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index a2d17fae7d2..296e54e3568 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..b576253f4f0 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -34,7 +34,7 @@ value="(max <?php p($_['uploadMaxHumanFilesize']); ?>)"> <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir"> <input type="file" id="file_upload_start" name='files[]'/> - <a href="#" class="svg" onclick="return false;"></a> + <a href="#" class="svg"></a> </form> </div> <?php if ($_['trash'] ): ?> @@ -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> |