From 3fc9a8e6957ddf75576dc63069c4c0249514499f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 15 Nov 2019 12:06:12 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/tree.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'app/assets/javascripts/tree.js')

diff --git a/app/assets/javascripts/tree.js b/app/assets/javascripts/tree.js
index 69b3d20914a..a530c4a99e2 100644
--- a/app/assets/javascripts/tree.js
+++ b/app/assets/javascripts/tree.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, consistent-return, no-var, one-var, no-else-return, class-methods-use-this */
+/* eslint-disable func-names, consistent-return, one-var, no-else-return, class-methods-use-this */
 
 import $ from 'jquery';
 import { visitUrl } from './lib/utils/url_utility';
@@ -9,9 +9,8 @@ export default class TreeView {
     // Code browser tree slider
     // Make the entire tree-item row clickable, but not if clicking another link (like a commit message)
     $('.tree-content-holder .tree-item').on('click', function(e) {
-      var $clickedEl, path;
-      $clickedEl = $(e.target);
-      path = $('.tree-item-file-name a', this).attr('href');
+      const $clickedEl = $(e.target);
+      const path = $('.tree-item-file-name a', this).attr('href');
       if (!$clickedEl.is('a') && !$clickedEl.is('.str-truncated')) {
         if (e.metaKey || e.which === 2) {
           e.preventDefault();
@@ -26,11 +25,10 @@ export default class TreeView {
   }
 
   initKeyNav() {
-    var li, liSelected;
-    li = $('tr.tree-item');
-    liSelected = null;
+    const li = $('tr.tree-item');
+    let liSelected = null;
     return $('body').keydown(e => {
-      var next, path;
+      let next, path;
       if ($('input:focus').length > 0 && (e.which === 38 || e.which === 40)) {
         return false;
       }
-- 
cgit v1.2.3