1 files changed, 18 insertions, 30 deletions

diff --git a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js b/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
index bcd0444b..266db926 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
+++ b/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014 ThoughtWorks, Inc.
-   *
+ *
  * Pixelated is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -26,14 +26,10 @@ define(
 
   function mailItem() {
     this.updateSelected = function (ev, data) {
-      if(data.ident === this.attr.ident) { this.doSelect(); }
+      if (data.ident === this.attr.mail.ident) { this.doSelect(); }
       else { this.doUnselect(); }
     };
 
-    this.formattedDate = function (date) {
-      return viewHelper.getFormattedDate(new Date(date));
-    };
-
     this.isOpeningOnANewTab = function (ev) {
       return ev.metaKey || ev.ctrlKey || ev.which === 2;
     };
@@ -46,9 +42,12 @@ define(
       this.$node.removeClass('selected');
     };
 
-    this.triggerMailChecked = function (ev, data) {
-      var eventToTrigger = ev.target.checked ? events.ui.mail.checked : events.ui.mail.unchecked;
-      this.trigger(document, eventToTrigger, { mail: this.attr.mail});
+    this.doMailChecked = function (ev) {
+      if (ev.target.checked) {
+        this.checkCheckbox();
+      } else {
+        this.uncheckCheckbox();
+      }
     };
 
     this.checkboxElement = function () {
@@ -57,42 +56,31 @@ define(
 
     this.checkCheckbox = function () {
       this.checkboxElement().prop('checked', true);
-      this.triggerMailChecked({'target': {'checked': true}});
+      this.trigger(document, events.ui.mail.checked, { mail: this.attr.mail});
     };
 
     this.uncheckCheckbox = function () {
       this.checkboxElement().prop('checked', false);
-      this.triggerMailChecked({'target': {'checked': false}});
+      this.trigger(document, events.ui.mail.unchecked, { mail: this.attr.mail});
     };
 
     this.render = function () {
-      this.attr.tagsForListView = _.without(this.attr.tags, this.attr.tag);
-      var mailItemHtml = templates.mails[this.attr.templateType](this.attr);
+      this.attr.mail.tagsForListView = _.without(this.attr.mail.tags, this.attr.tag);
+      var mailItemHtml = templates.mails[this.attr.templateType](this.attr.mail);
       this.$node.html(mailItemHtml);
-      this.$node.addClass(this.attr.statuses);
-      if(this.attr.selected) { this.doSelect(); }
+      this.$node.addClass(viewHelper.formatStatusClasses(this.attr.mail.status));
+      if (this.attr.selected) { this.doSelect(); }
       this.on(this.$node.find('a'), 'click', this.triggerOpenMail);
     };
 
-    this.initializeAttributes = function () {
-      var mail = this.attr.mail;
-      this.attr.ident = mail.ident;
-      this.attr.header = mail.header;
-      this.attr.ident = mail.ident;
-      this.attr.statuses = viewHelper.formatStatusClasses(mail.status);
-      this.attr.tags = mail.tags;
-      this.attr.attachments = mail.attachments;
-      this.attr.mailbox = mail.mailbox;
-      this.attr.header.formattedDate = this.formattedDate(mail.header.date);
-    };
-
-    this.attachListeners = function () {
-      this.on(this.$node.find('input[type=checkbox]'), 'change', this.triggerMailChecked);
+    this.after('initialize', function () {
+      this.on(this.$node.find('input[type=checkbox]'), 'change', this.doMailChecked);
       this.on(document, events.ui.mails.cleanSelected, this.doUnselect);
       this.on(document, events.ui.tag.select, this.doUnselect);
+      this.on(document, events.ui.tag.select, this.uncheckCheckbox);
       this.on(document, events.ui.mails.uncheckAll, this.uncheckCheckbox);
       this.on(document, events.ui.mails.checkAll, this.checkCheckbox);
-    };
+    });
   }
 
   return mailItem;