From 0683372200aaf989b596e34a9864cd0c6dd980a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 20 Sep 2013 14:58:52 +0200
Subject: [PATCH] canceling individual uploads is currently impossible because
there is no placeholder
---
apps/files/js/file-upload.js | 20 --------------------
apps/files/js/fileactions.js | 15 +--------------
2 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index b52221ac1f..f1ef485fc3 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -41,26 +41,6 @@ function supportAjaxUploadWithProgress() {
*/
OC.Upload = {
_uploads: [],
- /**
- * cancels a single upload,
- * @deprecated because it was only used when a file currently beeing uploaded was deleted. Now they are added after
- * they have been uploaded.
- * @param {string} dir
- * @param {string} filename
- * @returns {unresolved}
- */
- cancelUpload:function(dir, filename) {
- var self = this;
- var deleted = false;
- //FIXME _selections
- jQuery.each(this._uploads, function(i, jqXHR) {
- if (selection.dir === dir && selection.uploads[filename]) {
- deleted = self.deleteSelectionUpload(selection, filename);
- return false; // end searching through selections
- }
- });
- return deleted;
- },
/**
* deletes the jqHXR object from a data selection
* @param {object} data
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 67d3d5ead8..e14e52eb6c 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -177,20 +177,7 @@ $(document).ready(function () {
FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
return OC.imagePath('core', 'actions/delete');
}, function (filename) {
- if (OC.Upload.cancelUpload($('#dir').val(), filename)) {
- if (filename.substr) {
- filename = [filename];
- }
- $.each(filename, function (index, file) {
- var filename = $('tr').filterAttr('data-file', file);
- filename.hide();
- filename.find('input[type="checkbox"]').removeAttr('checked');
- filename.removeClass('selected');
- });
- procesSelection();
- } else {
- FileList.do_delete(filename);
- }
+ FileList.do_delete(filename);
$('.tipsy').remove();
});
--
GitLab