Merge branch 'simple-eslint-fixes' into 'master'

Simple eslint fixes

See merge request !8536

5 files changed, 24 insertions, 24 deletions

diff --git a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6 b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
index c59d3996fab..2514459e65e 100644
--- a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
+++ b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, quotes, no-lonely-if, semi, max-len */
+/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, quotes, no-lonely-if, max-len */
 /* global Vue */
 /* global CommentsStore */
 
@@ -10,7 +10,7 @@
     data() {
       return {
         textareaIsEmpty: true
-      }
+      };
     },
     computed: {
       discussion: function () {
diff --git a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6 b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
index f47867fc3b0..c3898873eaa 100644
--- a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, guard-for-in, no-restricted-syntax, one-var, indent, space-before-function-paren, no-plusplus, no-lonely-if, no-continue, brace-style, max-len, quotes, semi */
+/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, guard-for-in, no-restricted-syntax, one-var, space-before-function-paren, no-lonely-if, no-continue, brace-style, max-len, quotes */
 /* global Vue */
 /* global DiscussionMixins */
 /* global CommentsStore */
@@ -46,13 +46,13 @@
     },
     methods: {
       jumpToNextUnresolvedDiscussion: function () {
-        let discussionsSelector,
-            discussionIdsInScope,
-            firstUnresolvedDiscussionId,
-            nextUnresolvedDiscussionId,
-            activeTab = window.mrTabs.currentAction,
-            hasDiscussionsToJumpTo = true,
-            jumpToFirstDiscussion = !this.discussionId;
+        let discussionsSelector;
+        let discussionIdsInScope;
+        let firstUnresolvedDiscussionId;
+        let nextUnresolvedDiscussionId;
+        let activeTab = window.mrTabs.currentAction;
+        let hasDiscussionsToJumpTo = true;
+        let jumpToFirstDiscussion = !this.discussionId;
 
         const discussionIdsForElements = function(elements) {
           return elements.map(function() {
@@ -68,11 +68,11 @@
 
           let unresolvedDiscussionCount = 0;
 
-          for (let i = 0; i < discussionIdsInScope.length; i++) {
+          for (let i = 0; i < discussionIdsInScope.length; i += 1) {
             const discussionId = discussionIdsInScope[i];
             const discussion = discussions[discussionId];
             if (discussion && !discussion.isResolved()) {
-              unresolvedDiscussionCount++;
+              unresolvedDiscussionCount += 1;
             }
           }
 
@@ -109,7 +109,7 @@
         }
 
         let currentDiscussionFound = false;
-        for (let i = 0; i < discussionIdsInScope.length; i++) {
+        for (let i = 0; i < discussionIdsInScope.length; i += 1) {
           const discussionId = discussionIdsInScope[i];
           const discussion = discussions[discussionId];
 
@@ -156,7 +156,7 @@
 
           // If the next discussion is closed, toggle it open.
           if ($target.find('.js-toggle-content').is(':hidden')) {
-            $target.find('.js-toggle-button i').trigger('click')
+            $target.find('.js-toggle-button i').trigger('click');
           }
         } else if (activeTab === 'diffs') {
           // Resolved discussions are hidden in the diffs tab by default.
@@ -170,7 +170,7 @@
           // If we are on the diffs tab, we don't scroll to the discussion itself, but to
           // 4 diff lines above it: the line the discussion was in response to + 3 context
           let prevEl;
-          for (let i = 0; i < 4; i++) {
+          for (let i = 0; i < 4; i += 1) {
             prevEl = $target.prev();
 
             // If the discussion doesn't have 4 lines above it, we'll have to do with fewer.
diff --git a/app/assets/javascripts/diff_notes/mixins/discussion.js.es6 b/app/assets/javascripts/diff_notes/mixins/discussion.js.es6
index a9ea18bf82b..3c08c222f46 100644
--- a/app/assets/javascripts/diff_notes/mixins/discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/mixins/discussion.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable object-shorthand, func-names, guard-for-in, no-restricted-syntax, comma-dangle, no-plusplus, no-param-reassign, max-len */
+/* eslint-disable object-shorthand, func-names, guard-for-in, no-restricted-syntax, comma-dangle, no-param-reassign, max-len */
 
 ((w) => {
   w.DiscussionMixins = {
@@ -13,7 +13,7 @@
           const discussion = this.discussions[discussionId];
 
           if (discussion.isResolved()) {
-            resolvedCount++;
+            resolvedCount += 1;
           }
         }
 
@@ -26,7 +26,7 @@
           const discussion = this.discussions[discussionId];
 
           if (!discussion.isResolved()) {
-            unresolvedCount++;
+            unresolvedCount += 1;
           }
         }
 
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6
index 78c74985f78..a52c476352d 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js.es6
+++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable class-methods-use-this, one-var, indent, camelcase, no-new, comma-dangle, semi, no-param-reassign, max-len */
+/* eslint-disable class-methods-use-this, one-var, camelcase, no-new, comma-dangle, no-param-reassign, max-len */
 /* global Vue */
 /* global Flash */
 /* global CommentsStore */
@@ -32,8 +32,8 @@
     }
 
     toggleResolveForDiscussion(projectPath, mergeRequestId, discussionId) {
-      const discussion = CommentsStore.state[discussionId],
-            isResolved = discussion.isResolved();
+      const discussion = CommentsStore.state[discussionId];
+      const isResolved = discussion.isResolved();
       let promise;
 
       if (isResolved) {
@@ -59,7 +59,7 @@
         } else {
           new Flash('An error occurred when trying to resolve a discussion. Please try again.', 'alert');
         }
-      })
+      });
     }
 
     resolveAll(projectPath, mergeRequestId, discussionId) {
diff --git a/app/assets/javascripts/diff_notes/stores/comments.js.es6 b/app/assets/javascripts/diff_notes/stores/comments.js.es6
index 1a7abbc6f75..c80d979b977 100644
--- a/app/assets/javascripts/diff_notes/stores/comments.js.es6
+++ b/app/assets/javascripts/diff_notes/stores/comments.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable object-shorthand, func-names, camelcase, prefer-const, no-restricted-syntax, guard-for-in, comma-dangle, max-len, no-param-reassign */
+/* eslint-disable object-shorthand, func-names, camelcase, no-restricted-syntax, guard-for-in, comma-dangle, max-len, no-param-reassign */
 /* global Vue */
 /* global DiscussionModel */
 
@@ -41,7 +41,7 @@
       }
     },
     unresolvedDiscussionIds: function () {
-      let ids = [];
+      const ids = [];
 
       for (const discussionId in this.state) {
         const discussion = this.state[discussionId];