From 8898862d36b1f0fe8e7d7bdc80064e5106894d29 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 26 Nov 2019 02:29:36 +0200 Subject: Fix lint errors. --- client/components/swimlanes/swimlaneHeader.js | 4 +-- client/components/swimlanes/swimlanes.js | 50 ++++++++++++--------------- 2 files changed, 24 insertions(+), 30 deletions(-) (limited to 'client/components/swimlanes') diff --git a/client/components/swimlanes/swimlaneHeader.js b/client/components/swimlanes/swimlaneHeader.js index 69971b05..fbc45351 100644 --- a/client/components/swimlanes/swimlaneHeader.js +++ b/client/components/swimlanes/swimlaneHeader.js @@ -1,3 +1,5 @@ +import { Cookies } from 'meteor/ostrio:cookies'; +const cookies = new Cookies(); const { calculateIndexData } = Utils; let swimlaneColors; @@ -34,8 +36,6 @@ Template.swimlaneHeader.helpers({ if (currentUser) { return (currentUser.profile || {}).showDesktopDragHandles; } else { - import { Cookies } from 'meteor/ostrio:cookies'; - const cookies = new Cookies(); if (cookies.has('showDesktopDragHandles')) { return true; } else { diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 9bc093be..8687a0e8 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -1,10 +1,12 @@ +import { Cookies } from 'meteor/ostrio:cookies'; +const cookies = new Cookies(); const { calculateIndex, enableClickOnTouch } = Utils; function currentListIsInThisSwimlane(swimlaneId) { const currentList = Lists.findOne(Session.get('currentList')); return ( - currentList - && (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '') + currentList && + (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '') ); } @@ -12,14 +14,14 @@ function currentCardIsInThisList(listId, swimlaneId) { const currentCard = Cards.findOne(Session.get('currentCard')); const currentUser = Meteor.user(); if ( - currentUser - && currentUser.profile - && Utils.boardView() === 'board-view-swimlanes' + currentUser && + currentUser.profile && + Utils.boardView() === 'board-view-swimlanes' ) return ( - currentCard - && currentCard.listId === listId - && currentCard.swimlaneId === swimlaneId + currentCard && + currentCard.listId === listId && + currentCard.swimlaneId === swimlaneId ); // Default view: board-view-lists else return currentCard && currentCard.listId === listId; @@ -90,9 +92,9 @@ function initSortable(boardComponent, $listsDom) { function userIsMember() { return ( - Meteor.user() - && Meteor.user().isBoardMember() - && !Meteor.user().isCommentOnly() + Meteor.user() && + Meteor.user().isBoardMember() && + !Meteor.user().isCommentOnly() ); } @@ -103,8 +105,6 @@ function initSortable(boardComponent, $listsDom) { showDesktopDragHandles = (currentUser.profile || {}) .showDesktopDragHandles; } else { - import { Cookies } from 'meteor/ostrio:cookies'; - const cookies = new Cookies(); if (cookies.has('showDesktopDragHandles')) { showDesktopDragHandles = true; } else { @@ -147,8 +147,6 @@ BlazeComponent.extendComponent({ initSortable(boardComponent, $listsDom); - import { Cookies } from 'meteor/ostrio:cookies'; - const cookies = new Cookies(); if (cookies.has('collapseSwimlane')) { // Minimize swimlanes start https://www.w3schools.com/howto/howto_js_accordion.asp const acc = document.getElementsByClassName('accordion'); @@ -203,8 +201,6 @@ BlazeComponent.extendComponent({ showDesktopDragHandles = (currentUser.profile || {}) .showDesktopDragHandles; } else { - import { Cookies } from 'meteor/ostrio:cookies'; - const cookies = new Cookies(); if (cookies.has('showDesktopDragHandles')) { showDesktopDragHandles = true; } else { @@ -213,15 +209,15 @@ BlazeComponent.extendComponent({ } const noDragInside = ['a', 'input', 'textarea', 'p'].concat( - Utils.isMiniScreen() - || (!Utils.isMiniScreen() && showDesktopDragHandles) + Utils.isMiniScreen() || + (!Utils.isMiniScreen() && showDesktopDragHandles) ? ['.js-list-handle', '.js-swimlane-header-handle'] : ['.js-list-header'], ); if ( - $(evt.target).closest(noDragInside.join(',')).length === 0 - && this.$('.swimlane').prop('clientHeight') > evt.offsetY + $(evt.target).closest(noDragInside.join(',')).length === 0 && + this.$('.swimlane').prop('clientHeight') > evt.offsetY ) { this._isDragging = true; this._lastDragPositionX = evt.clientX; @@ -255,8 +251,8 @@ BlazeComponent.extendComponent({ onCreated() { this.currentBoard = Boards.findOne(Session.get('currentBoard')); this.isListTemplatesSwimlane = - this.currentBoard.isTemplatesBoard() - && this.currentData().isListTemplatesSwimlane(); + this.currentBoard.isTemplatesBoard() && + this.currentData().isListTemplatesSwimlane(); this.currentSwimlane = this.currentData(); }, @@ -299,8 +295,6 @@ Template.swimlane.helpers({ if (currentUser) { return (currentUser.profile || {}).showDesktopDragHandles; } else { - import { Cookies } from 'meteor/ostrio:cookies'; - const cookies = new Cookies(); if (cookies.has('showDesktopDragHandles')) { return true; } else { @@ -310,9 +304,9 @@ Template.swimlane.helpers({ }, canSeeAddList() { return ( - Meteor.user() - && Meteor.user().isBoardMember() - && !Meteor.user().isCommentOnly() + Meteor.user() && + Meteor.user().isBoardMember() && + !Meteor.user().isCommentOnly() ); }, }); -- cgit v1.2.3-1-g7c22