#153 fix mail checking and unchecking on mail list

3 files changed, 7 insertions, 10 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 94f08a9f..f7ae2f0c 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
@@ -36,7 +36,6 @@ define(
 
     this.doSelect = function () {
       this.$node.addClass('selected');
-      this.checkCheckbox();
     };
 
     this.doUnselect = function () {
diff --git a/web-ui/app/js/mail_list/ui/mail_list.js b/web-ui/app/js/mail_list/ui/mail_list.js
index c2746c88..69327a57 100644
--- a/web-ui/app/js/mail_list/ui/mail_list.js
+++ b/web-ui/app/js/mail_list/ui/mail_list.js
@@ -121,15 +121,15 @@ define(
       };
 
       this.updateCheckAllCheckbox = function () {
-        this.trigger(document, events.ui.mails.hasMailsChecked, {hasMailsChecked: _.keys(this.attr.checkedMails).length > 0});
+        this.trigger(document, events.ui.mails.hasMailsChecked, _.keys(this.attr.checkedMails).length > 0);
       };
 
-      this.addToSelectedMails = function (ev, data) {
+      this.addToCheckedMails = function (ev, data) {
         this.attr.checkedMails[data.mail.ident] = data.mail;
         this.updateCheckAllCheckbox();
       };
 
-      this.removeFromSelectedMails = function (ev, data) {
+      this.removeFromCheckedMails = function (ev, data) {
         if (data.mails) {
           _.each(data.mails, function (mail) {
             delete this.attr.checkedMails[mail.ident];
@@ -169,8 +169,8 @@ define(
 
         this.on(document, events.ui.mail.updateSelected, this.updateSelected);
         this.on(document, events.ui.mail.wantChecked, this.respondWithCheckedMails);
-        this.on(document, events.ui.mail.checked, this.addToSelectedMails);
-        this.on(document, events.ui.mail.unchecked, this.removeFromSelectedMails);
+        this.on(document, events.ui.mail.checked, this.addToCheckedMails);
+        this.on(document, events.ui.mail.unchecked, this.removeFromCheckedMails);
 
         this.openMailFromUrl = utils.once(function () {
           if (this.shouldSelectEmailFromUrlMailIdent()) {
diff --git a/web-ui/app/js/services/mail_service.js b/web-ui/app/js/services/mail_service.js
index ca8b1da1..1fa41619 100644
--- a/web-ui/app/js/services/mail_service.js
+++ b/web-ui/app/js/services/mail_service.js
@@ -108,8 +108,7 @@ define(
       this.triggerMailsRead = function (mails) {
         return _.bind(function () {
           this.refreshMails();
-          this.trigger(document, events.ui.mail.unchecked, { mails: mails });
-          this.trigger(document, events.ui.mails.hasMailsChecked, false);
+          this.trigger(document, events.ui.mails.uncheckAll);
         }, this);
       };
 
@@ -119,8 +118,7 @@ define(
 
           this.refreshMails();
           this.trigger(document, events.ui.userAlerts.displayMessage, { message: dataToDelete.successMessage});
-          this.trigger(document, events.ui.mail.unchecked, { mails: mails });
-          this.trigger(document, events.ui.mails.hasMailsChecked, false);
+          this.trigger(document, events.ui.mails.uncheckAll);
           this.trigger(document, events.mail.deleted, { mails: mails });
         }, this);
       };