Skip to content

Commit ee74ae0

Browse files
committed
use submodule icon in diff tree when rendering a submodule
1 parent 1a12acd commit ee74ae0

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

templates/repo/diff/box.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</div>
5959
{{end}}
6060
<script id="diff-data-script" type="module">
61-
const diffDataFiles = [{{range $i, $file := .Diff.Files}}{Name:"{{$file.Name}}",NameHash:"{{$file.NameHash}}",Type:{{$file.Type}},IsBin:{{$file.IsBin}},Addition:{{$file.Addition}},Deletion:{{$file.Deletion}},IsViewed:{{$file.IsViewed}}},{{end}}];
61+
const diffDataFiles = [{{range $i, $file := .Diff.Files}}{Name:"{{$file.Name}}",NameHash:"{{$file.NameHash}}",Type:{{$file.Type}},IsBin:{{$file.IsBin}},IsSubmodule:{{$file.IsSubmodule}},Addition:{{$file.Addition}},Deletion:{{$file.Deletion}},IsViewed:{{$file.IsViewed}}},{{end}}];
6262
const diffData = {
6363
isIncomplete: {{.Diff.IsIncomplete}},
6464
tooManyFilesMessage: "{{ctx.Locale.Tr "repo.diff.too_many_files"}}",

web_src/js/components/DiffFileTreeItem.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ type File = {
88
NameHash: string;
99
Type: number;
1010
IsViewed: boolean;
11+
IsSubmodule: boolean;
1112
}
1213
1314
type Item = {
@@ -34,6 +35,13 @@ function getIconForDiffType(pType) {
3435
};
3536
return diffTypes[pType];
3637
}
38+
39+
function fileIcon(file) {
40+
if (file.IsSubmodule) {
41+
return 'octicon-file-submodule';
42+
}
43+
return 'octicon-file';
44+
}
3745
</script>
3846

3947
<template>
@@ -44,7 +52,7 @@ function getIconForDiffType(pType) {
4452
:title="item.name" :href="'#diff-' + item.file.NameHash"
4553
>
4654
<!-- file -->
47-
<SvgIcon name="octicon-file"/>
55+
<SvgIcon :name="fileIcon(item.file)"/>
4856
<span class="gt-ellipsis tw-flex-1">{{ item.name }}</span>
4957
<SvgIcon :name="getIconForDiffType(item.file.Type).name" :class="getIconForDiffType(item.file.Type).classes"/>
5058
</a>

web_src/js/svg.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import octiconEye from '../../public/assets/img/svg/octicon-eye.svg';
2828
import octiconFile from '../../public/assets/img/svg/octicon-file.svg';
2929
import octiconFileDirectoryFill from '../../public/assets/img/svg/octicon-file-directory-fill.svg';
3030
import octiconFileDirectoryOpenFill from '../../public/assets/img/svg/octicon-file-directory-open-fill.svg';
31+
import octiconFileSubmodule from '../../public/assets/img/svg/octicon-file-submodule.svg';
3132
import octiconFilter from '../../public/assets/img/svg/octicon-filter.svg';
3233
import octiconGear from '../../public/assets/img/svg/octicon-gear.svg';
3334
import octiconGitBranch from '../../public/assets/img/svg/octicon-git-branch.svg';
@@ -104,6 +105,7 @@ const svgs = {
104105
'octicon-file': octiconFile,
105106
'octicon-file-directory-fill': octiconFileDirectoryFill,
106107
'octicon-file-directory-open-fill': octiconFileDirectoryOpenFill,
108+
'octicon-file-submodule': octiconFileSubmodule,
107109
'octicon-filter': octiconFilter,
108110
'octicon-gear': octiconGear,
109111
'octicon-git-branch': octiconGitBranch,

0 commit comments

Comments
 (0)