]> source.dussan.org Git - gitea.git/commitdiff
Only show diff file tree when more than one file changed (#27775)
authorsilverwind <me@silverwind.io>
Wed, 25 Oct 2023 03:09:18 +0000 (05:09 +0200)
committerGitHub <noreply@github.com>
Wed, 25 Oct 2023 03:09:18 +0000 (05:09 +0200)
When 0 or 1 files changed in a diff, we don't need to show a file tree.
This behaviour matches GitHub. Single-file diff after this change, note
absence of button:

<img width="1234" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/3618438b-e655-42a3-989f-f299267b2b8b">

Co-authored-by: Giteabot <teabot@gitea.io>
templates/repo/diff/box.tmpl

index 289ed90d3fd3fb2f8b6eb619512cb62bd6d51041..c037c3b365238454771f7a642a721bace74b7687 100644 (file)
@@ -1,7 +1,8 @@
+{{$showFileTree := (and (not .DiffNotAvailable) (gt .Diff.NumFiles 1))}}
 <div>
        <div class="diff-detail-box diff-box">
                <div class="gt-df gt-ac gt-fw">
-                       {{if not .DiffNotAvailable}}
+                       {{if $showFileTree}}
                                <button class="diff-toggle-file-tree-button gt-df gt-ac not-mobile" data-show-text="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}" data-hide-text="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
                                        {{/* the icon meaning is reversed here, "octicon-sidebar-collapse" means show the file tree */}}
                                        {{svg "octicon-sidebar-collapse" 20 "icon gt-hidden"}}
@@ -15,6 +16,8 @@
                                        diffTreeBtn.querySelector(diffTreeIcon).classList.remove('gt-hidden');
                                        diffTreeBtn.setAttribute('data-tooltip-content', diffTreeBtn.getAttribute(diffTreeVisible ? 'data-hide-text' : 'data-show-text'));
                                </script>
+                       {{end}}
+                       {{if not .DiffNotAvailable}}
                                <div class="diff-detail-stats gt-df gt-ac gt-fw">
                                        {{svg "octicon-diff" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
                                </div>
                <div id="diff-file-list"></div>
        {{end}}
        <div id="diff-container">
-               {{if .DiffNotAvailable}}
-                       <h4>{{ctx.Locale.Tr "repo.diff.data_not_available"}}</h4>
-               {{else}}
+               {{if $showFileTree}}
                        <div id="diff-file-tree" class="gt-hidden"></div>
                        <script>
                                if (diffTreeVisible) document.getElementById('diff-file-tree').classList.remove('gt-hidden');
                        </script>
+               {{end}}
+               {{if .DiffNotAvailable}}
+                       <h4>{{ctx.Locale.Tr "repo.diff.data_not_available"}}</h4>
+               {{else}}
                        <div id="diff-file-boxes" class="sixteen wide column">
                                {{range $i, $file := .Diff.Files}}
                                        {{/*notice: the index of Diff.Files should not be used for element ID, because the index will be restarted from 0 when doing load-more for PRs with a lot of files*/}}