massive update of bower and npm libs - includes flight, jasmine and a bunch of

stuff. If things get weird when developing, remove you bower_components
and your node_modules and install it again

2 files changed, 6 insertions, 6 deletions

diff --git a/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js b/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js
index d5dfbf28..c313b030 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js
+++ b/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js
@@ -102,7 +102,7 @@ define(
           this.checkCheckbox();
         }
 
-        this.on(document, events.ui.composeBox.newMessage, this.unselect);
+        this.on(document, events.ui.composeBox.newMessage, this.doUnselect);
         this.on(document, events.ui.mail.open, this.openMail);
         this.on(document, events.ui.mail.updateSelected, this.updateSelected);
         this.on(document, events.mails.teardown, this.teardown);
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 5f1f354a..51ace714 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
@@ -22,19 +22,19 @@ define(
 
   function mailItem() {
     this.updateSelected = function (ev, data) {
-      if(data.ident === this.attr.ident) { this.select(); }
-      else { this.unselect(); }
+      if(data.ident === this.attr.ident) { this.doSelect(); }
+      else { this.doUnselect(); }
     };
 
     this.formattedDate = function (date) {
       return viewHelper.getFormattedDate(new Date(date));
     };
 
-    this.select = function () {
+    this.doSelect = function () {
       this.$node.addClass('selected');
     };
 
-    this.unselect = function () {
+    this.doUnselect = function () {
       this.$node.removeClass('selected');
     };
 
@@ -70,7 +70,7 @@ define(
 
     this.attachListeners = function () {
       this.on(this.$node.find('input[type=checkbox]'), 'change', this.triggerMailChecked);
-      this.on(document, events.ui.mails.cleanSelected, this.unselect);
+      this.on(document, events.ui.mails.cleanSelected, this.doUnselect);
       this.on(document, events.ui.mails.uncheckAll, this.uncheckCheckbox);
       this.on(document, events.ui.mails.checkAll, this.checkCheckbox);
     };