diff options
| author | VicDeo <dubiniuk@owncloud.com> | 2013-10-07 08:19:40 -0700 |
|---|---|---|
| committer | VicDeo <dubiniuk@owncloud.com> | 2013-10-07 08:19:40 -0700 |
| commit | d8b7e42fc1626c64a28a31cfbde4a3789b9097bf (patch) | |
| tree | ff67b75013249405357f73d2f35d52302df3aa75 /apps/files/js/file-upload.js | |
| parent | b48dffa9a302881e8d1effe9d03bc97e96adc23b (diff) | |
| parent | 4ccbace68df0150cdadaa8e680a7cb2639e8c628 (diff) | |
| download | nextcloud-server-d8b7e42fc1626c64a28a31cfbde4a3789b9097bf.tar.gz nextcloud-server-d8b7e42fc1626c64a28a31cfbde4a3789b9097bf.zip | |
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
File conflicts dialog fixes
Diffstat (limited to 'apps/files/js/file-upload.js')
| -rw-r--r-- | apps/files/js/file-upload.js | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index b52221ac1fc..f1ef485fc3d 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -42,26 +42,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 */ |