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

3 files changed, 8 insertions, 8 deletions

diff --git a/web-ui/app/js/mail_view/ui/recipients/recipient.js b/web-ui/app/js/mail_view/ui/recipients/recipient.js
index 327f40bb..004b9247 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipient.js
+++ b/web-ui/app/js/mail_view/ui/recipients/recipient.js
@@ -40,11 +40,11 @@ define(
         this.teardown();
       };
 
-      this.select = function () {
+      this.doSelect = function () {
         this.$node.find('.recipient-value').addClass('selected');
       };
 
-      this.unselect = function () {
+      this.doUnselect = function () {
         this.$node.find('.recipient-value').removeClass('selected');
       };
     }
diff --git a/web-ui/app/js/mail_view/ui/recipients/recipients.js b/web-ui/app/js/mail_view/ui/recipients/recipients.js
index 1e4d909e..83761810 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipients.js
+++ b/web-ui/app/js/mail_view/ui/recipients/recipients.js
@@ -74,7 +74,7 @@ define(
           exitInput: this.attr.input.$node
         });
 
-        this.attr.iterator.current().select();
+        this.attr.iterator.current().doSelect();
         this.attr.input.$node.blur();
         this.select('navigationHandler').focus();
       };
diff --git a/web-ui/app/js/mail_view/ui/recipients/recipients_iterator.js b/web-ui/app/js/mail_view/ui/recipients/recipients_iterator.js
index 5253d915..38f18d61 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipients_iterator.js
+++ b/web-ui/app/js/mail_view/ui/recipients/recipients_iterator.js
@@ -31,15 +31,15 @@ define(['helpers/iterator'], function (Iterator) {
 
     this.moveLeft = function () {
       if (this.iterator.hasPrevious()) {
-        this.iterator.current().unselect();
-        this.iterator.previous().select();
+        this.iterator.current().doUnselect();
+        this.iterator.previous().doSelect();
       }
     };
 
     this.moveRight = function () {
-      this.iterator.current().unselect();
+      this.iterator.current().doUnselect();
       if (this.iterator.hasNext()) {
-        this.iterator.next().select();
+        this.iterator.next().doSelect();
       } else {
         this.input.focus();
       }
@@ -49,7 +49,7 @@ define(['helpers/iterator'], function (Iterator) {
       this.iterator.removeCurrent().destroy();
 
       if (this.iterator.hasElements()) {
-        this.iterator.current().select();
+        this.iterator.current().doSelect();
       } else {
         this.input.focus();
       }