Upgrade ESLint to v2

This commit also tweak the code style following backward-incompatible v2 rules.

9 files changed, 28 insertions, 16 deletions

diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 907c2157..34c2dcd6 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -208,11 +208,12 @@ BlazeComponent.extendComponent({
                 label.color.indexOf(term) > -1) {
               return label;
             }
+            return null;
           }));
         },
         template(label) {
           return Blaze.toHTMLWithData(Template.autocompleteLabelLine, {
-            hasNoName: !Boolean(label.name),
+            hasNoName: !label.name,
             colorName: label.color,
             labelName: label.name || label.color,
           });
@@ -233,6 +234,7 @@ BlazeComponent.extendComponent({
           evt.stopPropagation();
           return commands.KEY_ENTER;
         }
+        return null;
       },
     });
   },
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index a30a5e1d..bf92e9a0 100644
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -61,18 +61,20 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
   const mentionRegex = /\B@(\w*)/gi;
   let content = Blaze.toHTML(view.templateContentBlock);
 
-  let currentMention, knowedUser, linkClass, linkValue, link;
-  while (Boolean(currentMention = mentionRegex.exec(content))) {
-
-    knowedUser = _.findWhere(knowedUsers, { username: currentMention[1] });
-    if (!knowedUser)
+  let currentMention;
+  while ((currentMention = mentionRegex.exec(content)) !== null) {
+    const [fullMention, username] = currentMention;
+    const knowedUser = _.findWhere(knowedUsers, { username });
+    if (!knowedUser) {
       continue;
+    }
 
-    linkValue = [' ', at, knowedUser.username];
-    linkClass = 'atMention js-open-member';
-    if (knowedUser.userId === Meteor.userId())
+    const linkValue = [' ', at, knowedUser.username];
+    let linkClass = 'atMention js-open-member';
+    if (knowedUser.userId === Meteor.userId()) {
       linkClass += ' me';
-    link = HTML.A({
+    }
+    const link = HTML.A({
       'class': linkClass,
       // XXX Hack. Since we stringify this render function result below with
       // `Blaze.toHTML` we can't rely on blaze data contexts to pass the
@@ -81,7 +83,7 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
       'data-userId': knowedUser.userId,
     }, linkValue);
 
-    content = content.replace(currentMention[0], Blaze.toHTML(link));
+    content = content.replace(fullMention, Blaze.toHTML(link));
   }
 
   return HTML.Raw(content);
diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js
index 0a57f02c..f02d3a4a 100644
--- a/client/components/sidebar/sidebarFilters.js
+++ b/client/components/sidebar/sidebarFilters.js
@@ -68,7 +68,7 @@ BlazeComponent.extendComponent({
           const popup = Popup.open('disambiguateMultiLabel');
           // XXX We need to have a better integration between the popup and the
           // UI components systems.
-          return popup.call(this.currentData(), evt);
+          popup.call(this.currentData(), evt);
         }
       },
       'click .js-toggle-member-multiselection'(evt) {
@@ -82,7 +82,7 @@ BlazeComponent.extendComponent({
           const popup = Popup.open('disambiguateMultiMember');
           // XXX We need to have a better integration between the popup and the
           // UI components systems.
-          return popup.call(this.currentData(), evt);
+          popup.call(this.currentData(), evt);
         }
       },
       'click .js-move-selection': Popup.open('moveSelection'),
diff --git a/client/config/blazeHelpers.js b/client/config/blazeHelpers.js
index f3a1757f..ef075907 100644
--- a/client/config/blazeHelpers.js
+++ b/client/config/blazeHelpers.js
@@ -2,6 +2,8 @@ Blaze.registerHelper('currentBoard', () => {
   const boardId = Session.get('currentBoard');
   if (boardId) {
     return Boards.findOne(boardId);
+  } else {
+    return null;
   }
 });
 
@@ -9,6 +11,8 @@ Blaze.registerHelper('currentCard', () => {
   const cardId = Session.get('currentCard');
   if (cardId) {
     return Cards.findOne(cardId);
+  } else {
+    return null;
   }
 });
 
diff --git a/client/lib/cssEvents.js b/client/lib/cssEvents.js
index 39c3fb90..04f5707e 100644
--- a/client/lib/cssEvents.js
+++ b/client/lib/cssEvents.js
@@ -15,6 +15,7 @@ function whichTransitionEvent() {
       return transitions[t];
     }
   }
+  return null;
 }
 
 function whichAnimationEvent() {
@@ -32,6 +33,7 @@ function whichAnimationEvent() {
       return transitions[t];
     }
   }
+  return null;
 }
 
 CSSEvents = {
diff --git a/client/lib/escapeActions.js b/client/lib/escapeActions.js
index f2dc3dcb..49b80422 100644
--- a/client/lib/escapeActions.js
+++ b/client/lib/escapeActions.js
@@ -64,6 +64,7 @@ EscapeActions = {
   clickExecute(target, maxLabel) {
     if (this._nextclickPrevented) {
       this._nextclickPrevented = false;
+      return false;
     } else {
       return this._execute({
         maxLabel,
diff --git a/client/lib/multiSelection.js b/client/lib/multiSelection.js
index eeb2015d..30577fd4 100644
--- a/client/lib/multiSelection.js
+++ b/client/lib/multiSelection.js
@@ -109,12 +109,11 @@ MultiSelection = {
 
   toggleRange(cardId) {
     const selectedCards = this._selectedCards.get();
-    let startRange;
     this.reset();
     if (!this.isActive() || selectedCards.length === 0) {
       this.toggle(cardId);
     } else {
-      startRange = selectedCards[selectedCards.length - 1];
+      const startRange = selectedCards[selectedCards.length - 1];
       this.toggle(getCardsBetween(startRange, cardId));
     }
   },
diff --git a/client/lib/popup.js b/client/lib/popup.js
index 7cceaa4f..3166ca30 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -38,7 +38,8 @@ window.Popup = new class {
       if (self.isOpen()) {
         const previousOpenerElement = self._getTopStack().openerElement;
         if (previousOpenerElement === evt.currentTarget) {
-          return self.close();
+          self.close();
+          return;
         } else {
           $(previousOpenerElement).removeClass('is-active');
         }
diff --git a/client/lib/textComplete.js b/client/lib/textComplete.js
index 3e69d07f..69820514 100644
--- a/client/lib/textComplete.js
+++ b/client/lib/textComplete.js
@@ -14,6 +14,7 @@ $.fn.escapeableTextComplete = function(strategies, options, ...otherArgs) {
         evt.stopPropagation();
         return commands.KEY_ENTER;
       }
+      return null;
     },
     ...options,
   };