From 90601eacae616c3bca46d6dcb643aa94b1fd05c6 Mon Sep 17 00:00:00 2001 From: Maxime Quandalle Date: Sat, 13 Feb 2016 03:12:01 +0100 Subject: Upgrade ESLint to v2 This commit also tweak the code style following backward-incompatible v2 rules. --- client/lib/cssEvents.js | 2 ++ client/lib/escapeActions.js | 1 + client/lib/multiSelection.js | 3 +-- client/lib/popup.js | 3 ++- client/lib/textComplete.js | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) (limited to 'client/lib') 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, }; -- cgit v1.2.3-1-g7c22