canceling individual uploads is currently impossible because there is no placeholder

remotes/origin/stable6
Jörn Friedrich Dreyer 12 years ago committed by Morris Jobke
parent 5a174eba83
commit 0683372200
  1. 20
      apps/files/js/file-upload.js
  2. 15
      apps/files/js/fileactions.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

@ -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();
});

Loading…
Cancel
Save