Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Permalink files In PR diff #19534

Merged
merged 8 commits into from
Apr 29, 2022
Merged

Permalink files In PR diff #19534

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba440c3
Use hashed name as id.
KN4CK3R Apr 27, 2022
6a327d5
Merge branch 'main' into feature-diff-anchor
lunny Apr 28, 2022
cdb5d4e
Merge branch 'main' into feature-diff-anchor
6543 Apr 28, 2022
c908e9c
Merge branch 'main' into feature-diff-anchor
6543 Apr 28, 2022
db24042
Merge branch 'main' into feature-diff-anchor
wxiaoguang Apr 28, 2022
ab51924
Merge branch 'main' into feature-diff-anchor
6543 Apr 29, 2022
76136d9
Merge branch 'main' into feature-diff-anchor
lunny Apr 29, 2022
1cb4fe0
Merge branch 'main' into feature-diff-anchor
lafriks Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions templates/repo/diff/box.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</div>
<!-- todo finish all file status, now modify, add, delete and rename -->
<span class="status {{DiffTypeToStr .GetType}} tooltip" data-content="{{DiffTypeToStr .GetType}}" data-position="right center">&nbsp;</span>
<a class="file mono" href="#diff-{{.Index}}">{{.Name}}</a>
<a class="file mono" href="#diff-{{Sha1 .Name}}">{{.Name}}</a>
</li>
{{end}}
{{if .Diff.IsIncomplete}}
Expand All @@ -57,7 +57,8 @@
{{$isImage := or (call $.IsBlobAnImage $blobBase) (call $.IsBlobAnImage $blobHead)}}
{{$isCsv := (call $.IsCsvFile $file)}}
{{$showFileViewToggle := or $isImage (and (not $file.IsIncomplete) $isCsv)}}
<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}} mt-3" id="diff-{{.Index}}" data-old-filename="{{$file.OldName}}" data-new-filename="{{$file.Name}}" {{if $file.IsGenerated}}data-folded="true"{{end}}>
{{$nameHash := Sha1 $file.Name}}
<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}} mt-3" id="diff-{{$nameHash}}" data-old-filename="{{$file.OldName}}" data-new-filename="{{$file.Name}}" {{if $file.IsGenerated}}data-folded="true"{{end}}>
<h4 class="diff-file-header sticky-2nd-row ui top attached normal header df ac sb">
<div class="df ac">
<a role="button" class="fold-file muted mr-2">
Expand All @@ -76,7 +77,7 @@
{{template "repo/diff/stats" dict "file" . "root" $}}
{{end}}
</div>
<span class="file mono">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span>
<span class="file mono"><a href="#diff-{{$nameHash}}">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}</a>{{if .IsLFSFile}} ({{$.i18n.Tr "repo.stored_lfs"}}){{end}}</span>
{{if $file.IsGenerated}}
<span class="ui label ml-3">{{$.i18n.Tr "repo.diff.generated"}}</span>
{{end}}
Expand Down