Merge branch '38869-start' into 'master'

Enable eslint in star and remove from main.js

See merge request gitlab-org/gitlab-ce!14795

2 files changed, 21 insertions, 20 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 09cf5a2a3cb..8d7608ce0f4 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -116,7 +116,6 @@ import './right_sidebar';
 import './search';
 import './search_autocomplete';
 import './smart_interval';
-import './star';
 import './subscription';
 import './subscription_select';
 import initBreadcrumbs from './breadcrumb';
diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js
index 77db075d1ef..1a8dc085772 100644
--- a/app/assets/javascripts/star.js
+++ b/app/assets/javascripts/star.js
@@ -1,27 +1,29 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-unused-vars, one-var, no-var, one-var-declaration-per-line, prefer-arrow-callback, no-new, max-len */
 import Flash from './flash';
 import { __, s__ } from './locale';
 
 export default class Star {
   constructor() {
-    $('.project-home-panel .toggle-star').on('ajax:success', function(e, data, status, xhr) {
-      var $starIcon, $starSpan, $this, toggleStar;
-      $this = $(this);
-      $starSpan = $this.find('span');
-      $starIcon = $this.find('i');
-      toggleStar = function(isStarred) {
-        $this.parent().find('.star-count').text(data.star_count);
-        if (isStarred) {
-          $starSpan.removeClass('starred').text(s__('StarProject|Star'));
-          $starIcon.removeClass('fa-star').addClass('fa-star-o');
-        } else {
-          $starSpan.addClass('starred').text(__('Unstar'));
-          $starIcon.removeClass('fa-star-o').addClass('fa-star');
+    $('.project-home-panel .toggle-star')
+      .on('ajax:success', function handleSuccess(e, data) {
+        const $this = $(this);
+        const $starSpan = $this.find('span');
+        const $starIcon = $this.find('i');
+
+        function toggleStar(isStarred) {
+          $this.parent().find('.star-count').text(data.star_count);
+          if (isStarred) {
+            $starSpan.removeClass('starred').text(s__('StarProject|Star'));
+            $starIcon.removeClass('fa-star').addClass('fa-star-o');
+          } else {
+            $starSpan.addClass('starred').text(__('Unstar'));
+            $starIcon.removeClass('fa-star-o').addClass('fa-star');
+          }
         }
-      };
-      toggleStar($starSpan.hasClass('starred'));
-    }).on('ajax:error', function(e, xhr, status, error) {
-      new Flash('Star toggle failed. Try again later.', 'alert');
-    });
+
+        toggleStar($starSpan.hasClass('starred'));
+      })
+      .on('ajax:error', () => {
+        Flash('Star toggle failed. Try again later.', 'alert');
+      });
   }
 }