diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-03-26 14:49:04 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-03-26 14:49:04 -0700 |
| commit | 4158a417e7bc77bebe3bd01b7c8b7b467a1da5f0 (patch) | |
| tree | 5fcffca0de9a8e6261c6d358bd42bcee84c88c15 | |
| parent | 74852243e2e37c028b508b5f93e179cae4f011c7 (diff) | |
| parent | cf50e67e1ba741644f7f8a63739ba4705258380a (diff) | |
| download | nextcloud-server-4158a417e7bc77bebe3bd01b7c8b7b467a1da5f0.tar.gz nextcloud-server-4158a417e7bc77bebe3bd01b7c8b7b467a1da5f0.zip | |
Merge pull request #2578 from owncloud/fixing-2577-master
prevent to fire delete ajax a second time.
| -rw-r--r-- | apps/files/js/files.js | 2 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 82069e3bc57..c306f3ab6ab 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -233,7 +233,7 @@ $(document).ready(function() { return false; }); - $('.delete').click(function(event) { + $('.delete-selected').click(function(event) { var files=getSelectedFiles('name'); event.preventDefault(); FileList.do_delete(files); diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 0d7185bcb78..8ea3a718e85 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -84,13 +84,13 @@ <?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?> <!-- NOTE: Temporary fix to allow unsharing of files in root of Shared folder --> <?php if ($_['dir'] == '/Shared'): ?> - <span class="selectedActions"><a href="" class="delete"> + <span class="selectedActions"><a href="" class="delete-selected"> <?php p($l->t('Unshare'))?> <img class="svg" alt="<?php p($l->t('Unshare'))?>" src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" /> </a></span> <?php else: ?> - <span class="selectedActions"><a href="" class="delete"> + <span class="selectedActions"><a href="" class="delete-selected"> <?php p($l->t('Delete'))?> <img class="svg" alt="<?php p($l->t('Delete'))?>" src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" /> |