From 48144118cf0e861ad1ca0ae7900a8cd12d4313db Mon Sep 17 00:00:00 2001
From: Felix Hammerl <fhammerl@thoughtworks.com>
Date: Mon, 8 Feb 2016 17:59:42 +0100
Subject: Revert "Issue #549 - Implemented UI part of remote attachments"

This reverts commit e3939d4c1dff0f152fa13ce8a89f751c79ecace2.
---
 web-ui/app/js/mail_view/ui/attachment_list.js | 16 +++-------------
 web-ui/app/js/mail_view/ui/draft_box.js       | 17 +----------------
 web-ui/app/js/mail_view/ui/forward_box.js     | 17 +----------------
 web-ui/app/js/page/events.js                  |  3 +--
 4 files changed, 6 insertions(+), 47 deletions(-)

(limited to 'web-ui/app/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 b3b26710..942148c1 100644
--- a/web-ui/app/js/mail_view/ui/attachment_list.js
+++ b/web-ui/app/js/mail_view/ui/attachment_list.js
@@ -55,25 +55,15 @@ define(
             this.renderAttachmentListView = function (data) {
                 var currentHtml = this.select('attachmentListItem').html();
                 var item = this.buildAttachmentListItem(data);
-                this.select('attachmentListItem').append(item);
+                this.select('attachmentListItem').html(currentHtml + item);
             };
 
             this.buildAttachmentListItem = function (attachment) {
                 var attachmentData = {ident: attachment.ident,
                                       encoding: attachment.encoding,
                                       name: attachment.name,
-                                      size: attachment.size,
-                                      removable: true};
-
-                var element = $(templates.compose.attachmentItem(attachmentData));
-                var self = this;
-                element.find('i.remove-icon').bind('click', function(event) {
-                    var element = $(this);
-                    var ident = element.closest('li').attr('data-ident');
-                    self.trigger(document, events.mail.removeAttachment, {ident: ident});
-                    event.preventDefault();
-                });
-                return element;
+                                      size: attachment.size};
+                return templates.compose.attachmentItem(attachmentData);
             };
 
             this.performPreUploadCheck = function(e, data) {
diff --git a/web-ui/app/js/mail_view/ui/draft_box.js b/web-ui/app/js/mail_view/ui/draft_box.js
index 07a7e472..88051f30 100644
--- a/web-ui/app/js/mail_view/ui/draft_box.js
+++ b/web-ui/app/js/mail_view/ui/draft_box.js
@@ -64,15 +64,7 @@ define(
           },
           subject: mail.header.subject,
           body: body,
-          attachments: this.convertToRemovableAttachments(mail.attachments)
-        });
-
-        var self = this;
-        this.$node.find('i.remove-icon').bind('click', function(event) {
-          var element = $(this);
-          var ident = element.closest('li').attr('data-ident');
-          self.trigger(document, events.mail.removeAttachment, {ident: ident});
-          event.preventDefault();
+          attachments: mail.attachments
         });
 
         this.enableFloatlabel('input.floatlabel');
@@ -85,13 +77,6 @@ define(
         this.on(this.select('closeMailButton'), 'click', this.showNoMessageSelected);
       };
 
-      this.convertToRemovableAttachments = function(attachments) {
-        return attachments.map(function(attachment) {
-          attachment.removable = true;
-          return attachment;
-        });
-      };
-
       this.mailDeleted = function(event, data) {
         if (_.contains(_.pluck(data.mails, 'ident'),  this.attr.ident)) {
           this.trigger(events.dispatchers.rightPane.openNoMessageSelected);
diff --git a/web-ui/app/js/mail_view/ui/forward_box.js b/web-ui/app/js/mail_view/ui/forward_box.js
index 3d643b2f..a1b8dc41 100644
--- a/web-ui/app/js/mail_view/ui/forward_box.js
+++ b/web-ui/app/js/mail_view/ui/forward_box.js
@@ -46,29 +46,14 @@ define(
           subject: this.attr.subject,
           recipients: { to: [], cc: []},
           body: viewHelper.quoteMail(mail),
-          attachments: this.convertToRemovableAttachments(mail.attachments)
+          attachments: mail.attachments
         });
 
-        var self = this;
-        this.$node.find('i.remove-icon').bind('click', function(event) {
-          var element = $(this);
-          var ident = element.closest('li').attr('data-ident');
-          self.trigger(document, events.mail.removeAttachment, {ident: ident});
-          event.preventDefault();
-        });
-        
         this.on(this.select('subjectDisplay'), 'click', this.showSubjectInput);
         this.select('recipientsDisplay').hide();
         this.select('recipientsFields').show();
       };
 
-      this.convertToRemovableAttachments = function(attachments) {
-        return attachments.map(function(attachment) {
-          attachment.removable = true;
-          return attachment;
-        });
-      };
-
       this.showSubjectInput = function() {
         this.select('subjectDisplay').hide();
         this.select('subjectInput').show();
diff --git a/web-ui/app/js/page/events.js b/web-ui/app/js/page/events.js
index 1ec27c46..b1073437 100644
--- a/web-ui/app/js/page/events.js
+++ b/web-ui/app/js/page/events.js
@@ -148,8 +148,7 @@ define(function () {
       startUploadAttachment: 'mail:start:upload:attachment',
       failedUploadAttachment: 'mail:failed:upload:attachment',
       appendAttachment: 'mail:append:attachment',
-      resetAttachments: 'mail:reset:attachments',
-      removeAttachment: 'mail:remove:attachment'
+      resetAttachments: 'mail:reset:attachments'
     },
     mails: {
       available: 'mails:available',
-- 
cgit v1.2.3