#289 - uncheck mails when user changes current tag/mailbox

change solution to let event be handled in mail item mixin

4 files changed, 21 insertions, 16 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..fe77b248 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,7 +26,7 @@ define(
 
   function mailItem() {
     this.updateSelected = function (ev, data) {
-      if(data.ident === this.attr.ident) { this.doSelect(); }
+      if (data.ident === this.attr.ident) { this.doSelect(); }
       else { this.doUnselect(); }
     };
 
@@ -46,9 +46,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,12 +60,12 @@ 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 () {
@@ -87,9 +90,10 @@ define(
     };
 
     this.attachListeners = function () {
-      this.on(this.$node.find('input[type=checkbox]'), 'change', this.triggerMailChecked);
+      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);
     };
diff --git a/web-ui/app/js/tags/ui/tag_list.js b/web-ui/app/js/tags/ui/tag_list.js
index d6f6f76c..a2172c6d 100644
--- a/web-ui/app/js/tags/ui/tag_list.js
+++ b/web-ui/app/js/tags/ui/tag_list.js
@@ -98,7 +98,6 @@ define(
       this.after('initialize', function() {
         this.on(document, events.tags.received, this.displayTags);
         this.on(document, events.ui.tag.select, this.updateCurrentTag);
-        this.on(document, events.ui.tag.select, events.ui.mails.uncheckAll);
         this.renderTagListTemplate();
       });
     }
diff --git a/web-ui/test/spec/mail_list/ui/mail_items/mail_item.spec.js b/web-ui/test/spec/mail_list/ui/mail_items/mail_item.spec.js
index 058040c9..b1ac3037 100644
--- a/web-ui/test/spec/mail_list/ui/mail_items/mail_item.spec.js
+++ b/web-ui/test/spec/mail_list/ui/mail_items/mail_item.spec.js
@@ -10,6 +10,7 @@ describeMixin('mail_list/ui/mail_items/mail_item', function () {
       selected: false,
       tag: 'inbox'
     });
+    this.component.attachListeners();
   });
 
   describe('mail checkbox', function () {
@@ -20,6 +21,14 @@ describeMixin('mail_list/ui/mail_items/mail_item', function () {
       checkbox = this.component.$node.find('input[type=checkbox]');
     });
 
+    it('unchecks itself when another tag is selected', function () {
+      this.component.checkCheckbox();
+      this.component.trigger(document, Pixelated.events.ui.tag.select, { tag: 'amazing'});
+
+      expect(mailUncheckedEvent).toHaveBeenTriggeredOn(document);
+      expect(checkbox.prop('checked')).toBe(false);
+    });
+
     it('checkCheckbox checks it and triggers events.ui.mail.checked', function () {
       this.component.checkCheckbox();
 
diff --git a/web-ui/test/spec/tags/ui/tag_list.spec.js b/web-ui/test/spec/tags/ui/tag_list.spec.js
index e84c68aa..f92f72af 100644
--- a/web-ui/test/spec/tags/ui/tag_list.spec.js
+++ b/web-ui/test/spec/tags/ui/tag_list.spec.js
@@ -62,13 +62,6 @@ describeComponent('tags/ui/tag_list', function () {
       expect(this.component.attr.currentTag).toEqual('amazing');
     });
 
-    it('should uncheck all emails when a new tag is selected', function () {
-      var uncheckAllEvent = spyOnEvent(document, Pixelated.events.ui.mails.uncheckAll);
-      $(document).trigger(Pixelated.events.ui.tag.select, { tag: 'amazing'});
-
-      expect(uncheckAllEvent).toHaveBeenTriggeredOn(document);
-    });
-
     it('resets the tag lists when loading tags', function () {
       var tagList = [tag('tag1', 1, false), tag('tag2', 2, true), tag('tag3', 3, true)];
       $(document).trigger(Pixelated.events.tags.received, {tags: tagList});