1 files changed, 37 insertions, 29 deletions

diff --git a/client/lib/utils.js b/client/lib/utils.js
index c6a9adc5..0cd93419 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -1,62 +1,70 @@
 Utils = {
   // XXX We should remove these two methods
-  goBoardId: function(_id) {
-    var board = Boards.findOne(_id);
+  goBoardId(_id) {
+    const board = Boards.findOne(_id);
     return board && FlowRouter.go('board', {
       id: board._id,
-      slug: board.slug
+      slug: board.slug,
     });
   },
 
-  goCardId: function(_id) {
-    var card = Cards.findOne(_id);
-    var board = Boards.findOne(card.boardId);
+  goCardId(_id) {
+    const card = Cards.findOne(_id);
+    const board = Boards.findOne(card.boardId);
     return board && FlowRouter.go('card', {
       cardId: card._id,
       boardId: board._id,
-      slug: board.slug
+      slug: board.slug,
     });
   },
 
-  capitalize: function(string) {
+  capitalize(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
   },
 
-  getLabelIndex: function(boardId, labelId) {
-    var board = Boards.findOne(boardId);
-    var labels = {};
-    _.each(board.labels, function(a, b) {
+  getLabelIndex(boardId, labelId) {
+    const board = Boards.findOne(boardId);
+    const labels = {};
+    _.each(board.labels, (a, b) => {
       labels[a._id] = b;
     });
     return {
       index: labels[labelId],
-      key: function(key) {
-        return 'labels.' + labels[labelId] + '.' + key;
-      }
+      key(key) {
+        return `labels.${labels[labelId]}.${key}`;
+      },
     };
   },
 
   // Determine the new sort index
-  calculateIndex: function(prevCardDomElement, nextCardDomElement, nCards) {
-    nCards = nCards || 1;
-
+  calculateIndex(prevCardDomElement, nextCardDomElement, nCards = 1) {
+    let base, increment;
     // If we drop the card to an empty column
-    if (! prevCardDomElement && ! nextCardDomElement) {
-      return {base: 0, increment: 1};
+    if (!prevCardDomElement && !nextCardDomElement) {
+      base = 0;
+      increment = 1;
     // If we drop the card in the first position
-    } else if (! prevCardDomElement) {
-      return {base: Blaze.getData(nextCardDomElement).sort - 1, increment: -1};
+    } else if (!prevCardDomElement) {
+      base = Blaze.getData(nextCardDomElement).sort - 1;
+      increment = -1;
     // If we drop the card in the last position
-    } else if (! nextCardDomElement) {
-      return {base: Blaze.getData(prevCardDomElement).sort + 1, increment: 1};
+    } else if (!nextCardDomElement) {
+      base = Blaze.getData(prevCardDomElement).sort + 1;
+      increment = 1;
     }
     // In the general case take the average of the previous and next element
     // sort indexes.
     else {
-      var prevSortIndex = Blaze.getData(prevCardDomElement).sort;
-      var nextSortIndex = Blaze.getData(nextCardDomElement).sort;
-      var increment = (nextSortIndex - prevSortIndex) / (nCards + 1);
-      return {base: prevSortIndex + increment, increment: increment};
+      const prevSortIndex = Blaze.getData(prevCardDomElement).sort;
+      const nextSortIndex = Blaze.getData(nextCardDomElement).sort;
+      increment = (nextSortIndex - prevSortIndex) / (nCards + 1);
+      base = prevSortIndex + increment;
     }
-  }
+    // XXX Return a generator that yield values instead of a base with a
+    // increment number.
+    return {
+      base,
+      increment,
+    };
+  },
 };