From fa9e729aba58ddb00e09282e63a497d9d8e99dea Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 16 Oct 2017 11:28:56 +0100
Subject: fixed rendering bugs fixed eslint

---
 app/assets/javascripts/repo/components/repo_file.vue      |  3 ++-
 .../javascripts/repo/components/repo_prev_directory.vue   |  2 +-
 app/assets/javascripts/repo/components/repo_sidebar.vue   |  2 +-
 app/assets/javascripts/repo/helpers/repo_helper.js        |  2 +-
 app/assets/javascripts/repo/stores/repo_store.js          | 15 +--------------
 5 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/repo/components/repo_file.vue b/app/assets/javascripts/repo/components/repo_file.vue
index 905da9ef43c..61057b2a60f 100644
--- a/app/assets/javascripts/repo/components/repo_file.vue
+++ b/app/assets/javascripts/repo/components/repo_file.vue
@@ -58,10 +58,11 @@
     </td>
 
     <template v-if="!isMini">
-      <td class="commit-message hidden-sm hidden-xs">
+      <td class="hidden-sm hidden-xs">
         <a
           @click.stop
           :href="file.lastCommit.url"
+          class="commit-message"
         >
           {{ file.lastCommit.message }}
         </a>
diff --git a/app/assets/javascripts/repo/components/repo_prev_directory.vue b/app/assets/javascripts/repo/components/repo_prev_directory.vue
index d042fc664b6..f657276ad52 100644
--- a/app/assets/javascripts/repo/components/repo_prev_directory.vue
+++ b/app/assets/javascripts/repo/components/repo_prev_directory.vue
@@ -22,7 +22,7 @@
 </script>
 
 <template>
-  <tr class="prev-directory">
+  <tr class="file prev-directory">
     <td
       :colspan="colSpanCondition"
       class="table-cell"
diff --git a/app/assets/javascripts/repo/components/repo_sidebar.vue b/app/assets/javascripts/repo/components/repo_sidebar.vue
index e7c269cdb57..dc990324313 100644
--- a/app/assets/javascripts/repo/components/repo_sidebar.vue
+++ b/app/assets/javascripts/repo/components/repo_sidebar.vue
@@ -136,7 +136,7 @@ export default {
     </thead>
     <tbody>
       <repo-previous-directory
-        v-if="!isRoot"
+        v-if="!isRoot && !loading.tree"
         :prev-url="prevURL"
       />
       <repo-loading-file
diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js
index 9d05db0e414..2481a8aa107 100644
--- a/app/assets/javascripts/repo/helpers/repo_helper.js
+++ b/app/assets/javascripts/repo/helpers/repo_helper.js
@@ -94,7 +94,7 @@ const RepoHelper = {
     .then((response) => {
       const data = response.data;
       if (response.headers && response.headers['page-title']) data.pageTitle = response.headers['page-title'];
-      if (response.headers && response.headers['is-root']) Store.isRoot = convertPermissionToBoolean(response.headers['is-root']);
+      if (response.headers && response.headers['is-root'] && Store.isRoot === null) Store.isRoot = convertPermissionToBoolean(response.headers['is-root']);
 
       if (file && file.type === 'blob') {
         if (!file) file = data;
diff --git a/app/assets/javascripts/repo/stores/repo_store.js b/app/assets/javascripts/repo/stores/repo_store.js
index 2950e5702d6..1a9757f1a4a 100644
--- a/app/assets/javascripts/repo/stores/repo_store.js
+++ b/app/assets/javascripts/repo/stores/repo_store.js
@@ -2,13 +2,12 @@ import Helper from '../helpers/repo_helper';
 import Service from '../services/repo_service';
 
 const RepoStore = {
-  monaco: {},
   monacoLoading: false,
   service: '',
   canCommit: false,
   onTopOfBranch: false,
   editMode: false,
-  isRoot: false,
+  isRoot: null,
   prevURL: '',
   projectId: '',
   projectName: '',
@@ -38,23 +37,11 @@ const RepoStore = {
   newMrTemplateUrl: '',
   branchChanged: false,
   commitMessage: '',
-  binaryTypes: {
-    png: false,
-    md: false,
-    svg: false,
-    unknown: false,
-  },
   loading: {
     tree: false,
     blob: false,
   },
 
-  resetBinaryTypes() {
-    Object.keys(RepoStore.binaryTypes).forEach((key) => {
-      RepoStore.binaryTypes[key] = false;
-    });
-  },
-
   setBranchHash() {
     return Service.getBranch()
       .then((data) => {
-- 
cgit v1.2.1