From 511d621593a7c157f9f08994da1485a518f95796 Mon Sep 17 00:00:00 2001 From: Felix Hammerl Date: Wed, 3 Feb 2016 18:48:13 +0100 Subject: Issue #552 - Add upload abort Cancels an upload and restores the user interface to ready-for-upload state --- web-ui/app/js/mail_view/ui/attachment_list.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'web-ui/app/js/mail_view/ui/attachment_list.js') diff --git a/web-ui/app/js/mail_view/ui/attachment_list.js b/web-ui/app/js/mail_view/ui/attachment_list.js index 19a48a8d..936b2e81 100644 --- a/web-ui/app/js/mail_view/ui/attachment_list.js +++ b/web-ui/app/js/mail_view/ui/attachment_list.js @@ -31,6 +31,7 @@ define( attachmentListItem: '#attachment-list-item', attachmentUploadItem: '#attachment-upload-item', attachmentUploadItemProgress: '#attachment-upload-item-progress', + attachmentUploadItemAbort: '#attachment-upload-item-abort', attachmentBaseUrl: '/attachment', attachments: [], closeIcon: '.close-icon', @@ -119,6 +120,13 @@ define( this.select('attachmentUploadItem').hide(); }; + this.attachUploadAbort = function(e, data) { + this.on(this.select('attachmentUploadItemAbort'), 'click', function(e) { + data.abort(); + e.preventDefault(); + }); + }; + this.addJqueryFileUploadConfig = function() { var self = this; @@ -128,6 +136,7 @@ define( add: function(e, data) { if (self.performPreUploadCheck(e, data)) { self.showUploadProgressBar(); + self.attachUploadAbort(e, data); data.submit(); } else { self.showUploadError(); @@ -139,6 +148,10 @@ define( self.hideUploadProgressBar(); self.trigger(document, events.mail.uploadedAttachment, response.result); }, + fail: function(e, data){ + self.hideUploadProgressBar(); + self.trigger(document, events.mail.failedUploadAttachment); + }, progressall: function (e, data) { var progressRate = parseInt(data.loaded / data.total * 100, 10); self.select('attachmentUploadItemProgress').css('width', progressRate + '%'); -- cgit v1.2.3