1 files changed, 101 insertions, 62 deletions
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index d0ec3f4a..568c0bbe 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -2,16 +2,27 @@ const { calculateIndex, enableClickOnTouch } = Utils;
 
 function currentListIsInThisSwimlane(swimlaneId) {
   const currentList = Lists.findOne(Session.get('currentList'));
-  return currentList && (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '');
+  return (
+    currentList &&
+    (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '')
+  );
 }
 
 function currentCardIsInThisList(listId, swimlaneId) {
   const currentCard = Cards.findOne(Session.get('currentCard'));
   const currentUser = Meteor.user();
-  if (currentUser && currentUser.profile && currentUser.profile.boardView === 'board-view-swimlanes')
-    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
-  else // Default view: board-view-lists
-    return currentCard && currentCard.listId === listId;
+  if (
+    currentUser &&
+    currentUser.profile &&
+    currentUser.profile.boardView === 'board-view-swimlanes'
+  )
+    return (
+      currentCard &&
+      currentCard.listId === listId &&
+      currentCard.swimlaneId === swimlaneId
+    );
+  // Default view: board-view-lists
+  else return currentCard && currentCard.listId === listId;
   // https://github.com/wekan/wekan/issues/1623
   // https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de
   // TODO: In public board, if you would like to switch between List/Swimlane view, you could
@@ -79,7 +90,11 @@ function initSortable(boardComponent, $listsDom) {
   enableClickOnTouch('.js-list:not(.js-list-composer)');
 
   function userIsMember() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly()
+    );
   }
 
   // Disable drag-dropping while in multi-selection mode, or if the current user
@@ -87,8 +102,11 @@ function initSortable(boardComponent, $listsDom) {
   boardComponent.autorun(() => {
     const $listDom = $listsDom;
     if ($listDom.data('sortable')) {
-      $listsDom.sortable('option', 'disabled',
-        MultiSelection.isActive() || !userIsMember());
+      $listsDom.sortable(
+        'option',
+        'disabled',
+        MultiSelection.isActive() || !userIsMember(),
+      );
     }
   });
 }
@@ -124,47 +142,60 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      // Click-and-drag action
-      'mousedown .board-canvas'(evt) {
-        // Translating the board canvas using the click-and-drag action can
-        // conflict with the build-in browser mechanism to select text. We
-        // define a list of elements in which we disable the dragging because
-        // the user will legitimately expect to be able to select some text with
-        // his mouse.
-        const noDragInside = ['a', 'input', 'textarea', 'p', '.js-list-header'];
-        if ($(evt.target).closest(noDragInside.join(',')).length === 0 && this.$('.swimlane').prop('clientHeight') > evt.offsetY) {
-          this._isDragging = true;
-          this._lastDragPositionX = evt.clientX;
-        }
-      },
-      'mouseup'() {
-        if (this._isDragging) {
-          this._isDragging = false;
-        }
-      },
-      'mousemove'(evt) {
-        if (this._isDragging) {
-          // Update the canvas position
-          this.listsDom.scrollLeft -= evt.clientX - this._lastDragPositionX;
-          this._lastDragPositionX = evt.clientX;
-          // Disable browser text selection while dragging
-          evt.stopPropagation();
-          evt.preventDefault();
-          // Don't close opened card or inlined form at the end of the
-          // click-and-drag.
-          EscapeActions.executeUpTo('popup-close');
-          EscapeActions.preventNextClick();
-        }
+    return [
+      {
+        // Click-and-drag action
+        'mousedown .board-canvas'(evt) {
+          // Translating the board canvas using the click-and-drag action can
+          // conflict with the build-in browser mechanism to select text. We
+          // define a list of elements in which we disable the dragging because
+          // the user will legitimately expect to be able to select some text with
+          // his mouse.
+          const noDragInside = [
+            'a',
+            'input',
+            'textarea',
+            'p',
+            '.js-list-header',
+          ];
+          if (
+            $(evt.target).closest(noDragInside.join(',')).length === 0 &&
+            this.$('.swimlane').prop('clientHeight') > evt.offsetY
+          ) {
+            this._isDragging = true;
+            this._lastDragPositionX = evt.clientX;
+          }
+        },
+        mouseup() {
+          if (this._isDragging) {
+            this._isDragging = false;
+          }
+        },
+        mousemove(evt) {
+          if (this._isDragging) {
+            // Update the canvas position
+            this.listsDom.scrollLeft -= evt.clientX - this._lastDragPositionX;
+            this._lastDragPositionX = evt.clientX;
+            // Disable browser text selection while dragging
+            evt.stopPropagation();
+            evt.preventDefault();
+            // Don't close opened card or inlined form at the end of the
+            // click-and-drag.
+            EscapeActions.executeUpTo('popup-close');
+            EscapeActions.preventNextClick();
+          }
+        },
       },
-    }];
+    ];
   },
 }).register('swimlane');
 
 BlazeComponent.extendComponent({
   onCreated() {
     this.currentBoard = Boards.findOne(Session.get('currentBoard'));
-    this.isListTemplatesSwimlane = this.currentBoard.isTemplatesBoard() && this.currentData().isListTemplatesSwimlane();
+    this.isListTemplatesSwimlane =
+      this.currentBoard.isTemplatesBoard() &&
+      this.currentData().isListTemplatesSwimlane();
     this.currentSwimlane = this.currentData();
   },
 
@@ -174,32 +205,40 @@ BlazeComponent.extendComponent({
   },
 
   events() {
-    return [{
-      submit(evt) {
-        evt.preventDefault();
-        const titleInput = this.find('.list-name-input');
-        const title = titleInput.value.trim();
-        if (title) {
-          Lists.insert({
-            title,
-            boardId: Session.get('currentBoard'),
-            sort: $('.list').length,
-            type: (this.isListTemplatesSwimlane)?'template-list':'list',
-            swimlaneId: (this.currentBoard.isTemplatesBoard())?this.currentSwimlane._id:'',
-          });
-
-          titleInput.value = '';
-          titleInput.focus();
-        }
+    return [
+      {
+        submit(evt) {
+          evt.preventDefault();
+          const titleInput = this.find('.list-name-input');
+          const title = titleInput.value.trim();
+          if (title) {
+            Lists.insert({
+              title,
+              boardId: Session.get('currentBoard'),
+              sort: $('.list').length,
+              type: this.isListTemplatesSwimlane ? 'template-list' : 'list',
+              swimlaneId: this.currentBoard.isTemplatesBoard()
+                ? this.currentSwimlane._id
+                : '',
+            });
+
+            titleInput.value = '';
+            titleInput.focus();
+          }
+        },
+        'click .js-list-template': Popup.open('searchElement'),
       },
-      'click .js-list-template': Popup.open('searchElement'),
-    }];
+    ];
   },
 }).register('addListForm');
 
 Template.swimlane.helpers({
   canSeeAddList() {
-    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+    return (
+      Meteor.user() &&
+      Meteor.user().isBoardMember() &&
+      !Meteor.user().isCommentOnly()
+    );
   },
 });