Commit 7fdd4656 authored by Jacob Schatz's avatar Jacob Schatz

Adds loading to individual files.

parent 403fdf7f
...@@ -41,10 +41,10 @@ export default RepoFile; ...@@ -41,10 +41,10 @@ export default RepoFile;
<template> <template>
<tr v-if="!loading.tree || hasFiles" :class="{'active': activeFile.url === file.url}"> <tr v-if="!loading.tree || hasFiles" :class="{'active': activeFile.url === file.url}">
<td> <td @click.prevent="linkClicked(file)">
<i class="fa" v-if="!file.loading" :class="file.icon" :style="{'margin-left': file.level * 10 + 'px'}"></i> <i class="fa" v-if="!file.loading" :class="file.icon" :style="{'margin-left': file.level * 10 + 'px'}"></i>
<i class="fa fa-spinner fa-spin" v-if="file.loading" :style="{'margin-left': file.level * 10 + 'px'}"></i> <i class="fa fa-spinner fa-spin" v-if="file.loading" :style="{'margin-left': file.level * 10 + 'px'}"></i>
<a :href="file.url" @click.prevent="linkClicked(file)" class="repo-file-name" :title="file.url">{{file.name}}</a> <a :href="file.url" class="repo-file-name" :title="file.url">{{file.name}}</a>
</td> </td>
<td v-if="!isMini" class="hidden-sm hidden-xs"> <td v-if="!isMini" class="hidden-sm hidden-xs">
......
...@@ -87,7 +87,6 @@ const RepoHelper = { ...@@ -87,7 +87,6 @@ const RepoHelper = {
const fileIndex = indexOfFile + 1; const fileIndex = indexOfFile + 1;
const file = newFile; const file = newFile;
file.level = inDirectory.level + 1; file.level = inDirectory.level + 1;
oldList.splice(fileIndex, 0, file); oldList.splice(fileIndex, 0, file);
}); });
...@@ -140,7 +139,7 @@ const RepoHelper = { ...@@ -140,7 +139,7 @@ const RepoHelper = {
} }
}) })
.catch(() => { .catch(() => {
RepoHelper.setLoading(false, loadingData); // RepoHelper.setLoading(false, loadingData);
RepoHelper.loadingError(); RepoHelper.loadingError();
}); });
}, },
...@@ -179,6 +178,8 @@ const RepoHelper = { ...@@ -179,6 +178,8 @@ const RepoHelper = {
}; };
}, },
scrollTabsRight() { scrollTabsRight() {
// wait for the transition. 0.1 seconds. // wait for the transition. 0.1 seconds.
setTimeout(() => { setTimeout(() => {
......
...@@ -43,10 +43,11 @@ export default class RepoSidebar { ...@@ -43,10 +43,11 @@ export default class RepoSidebar {
linkClicked(clickedFile) { linkClicked(clickedFile) {
let url = ''; let url = '';
let file = clickedFile; let file = clickedFile;
file.loading = true;
if (typeof file === 'object') { if (typeof file === 'object') {
file.loading = true;
if (file.type === 'tree' && file.opened) { if (file.type === 'tree' && file.opened) {
file = Store.removeChildFilesOfTree(file); file = Store.removeChildFilesOfTree(file);
file.loading = false;
} else { } else {
url = file.url; url = file.url;
Service.url = url; Service.url = url;
...@@ -63,7 +64,6 @@ export default class RepoSidebar { ...@@ -63,7 +64,6 @@ export default class RepoSidebar {
url = file; url = file;
Service.url = url; Service.url = url;
Helper.getContent(null, () => { Helper.getContent(null, () => {
file.loading = false;
Helper.scrollTabsRight(); Helper.scrollTabsRight();
}); });
} }
......
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
} }
.cursor { .cursor {
background: $black; display: none !important;
border-color: $black;
} }
} }
...@@ -173,6 +172,7 @@ ...@@ -173,6 +172,7 @@
tr { tr {
animation: fadein 0.5s; animation: fadein 0.5s;
cursor: pointer;
&.repo-file-options td { &.repo-file-options td {
padding: 0; padding: 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment