2018-08-06 04:43:22 +00:00
|
|
|
{{$file := .file}}
|
2024-12-27 20:18:30 +00:00
|
|
|
{{$repoLink := or ctx.RootData.CommitRepoLink ctx.RootData.RepoLink}}
|
|
|
|
{{$afterCommitID := or $.root.AfterCommitID "no-after-commit-id"}}{{/* this tmpl is also used by the PR Conversation page, so the "AfterCommitID" may not exist */}}
|
|
|
|
{{$blobExcerptLink := print $repoLink (Iif $.root.PageIsWiki "/wiki" "") "/blob_excerpt/" (PathEscape $afterCommitID) "?"}}
|
2023-04-04 11:05:07 +00:00
|
|
|
<colgroup>
|
|
|
|
<col width="50">
|
|
|
|
<col width="50">
|
|
|
|
<col width="10">
|
|
|
|
<col width="10">
|
|
|
|
<col>
|
|
|
|
</colgroup>
|
2016-08-28 11:31:42 +00:00
|
|
|
{{range $j, $section := $file.Sections}}
|
|
|
|
{{range $k, $line := $section.Lines}}
|
2023-05-07 09:49:46 +00:00
|
|
|
<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}">
|
2023-03-06 01:37:58 +00:00
|
|
|
{{if eq .GetType 4}}
|
|
|
|
{{if $.root.AfterCommitID}}
|
2024-05-29 06:08:45 +00:00
|
|
|
{{$expandDirection := $line.GetExpandDirection}}
|
2020-08-08 01:22:34 +00:00
|
|
|
<td colspan="2" class="lines-num">
|
2024-05-29 06:08:45 +00:00
|
|
|
<div class="code-expander-buttons" data-expand-direction="{{$expandDirection}}">
|
|
|
|
{{if or (eq $expandDirection 3) (eq $expandDirection 5)}}
|
2024-12-24 16:51:13 +00:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptLink}}&{{$line.GetBlobExcerptQuery}}&style=unified&direction=down&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2023-05-21 20:47:41 +00:00
|
|
|
{{svg "octicon-fold-down"}}
|
|
|
|
</button>
|
|
|
|
{{end}}
|
2024-05-29 06:08:45 +00:00
|
|
|
{{if or (eq $expandDirection 3) (eq $expandDirection 4)}}
|
2024-12-24 16:51:13 +00:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptLink}}&{{$line.GetBlobExcerptQuery}}&style=unified&direction=up&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2023-05-21 20:47:41 +00:00
|
|
|
{{svg "octicon-fold-up"}}
|
|
|
|
</button>
|
|
|
|
{{end}}
|
2024-05-29 06:08:45 +00:00
|
|
|
{{if eq $expandDirection 2}}
|
2024-12-24 16:51:13 +00:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptLink}}&{{$line.GetBlobExcerptQuery}}&style=unified&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2023-05-21 20:47:41 +00:00
|
|
|
{{svg "octicon-fold"}}
|
|
|
|
</button>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
2020-08-08 01:22:34 +00:00
|
|
|
</td>
|
|
|
|
{{else}}
|
2023-03-06 01:37:58 +00:00
|
|
|
{{/* for code file preview page or comment diffs on pull comment pages, do not show the expansion arrows */}}
|
|
|
|
<td colspan="2" class="lines-num"></td>
|
2019-11-15 02:52:59 +00:00
|
|
|
{{end}}
|
2023-03-06 01:37:58 +00:00
|
|
|
{{else}}
|
|
|
|
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$file.NameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
|
|
|
|
<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$file.NameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
|
|
|
|
{{end}}
|
2023-09-25 12:42:40 +00:00
|
|
|
{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale -}}
|
2023-05-21 20:47:41 +00:00
|
|
|
<td class="lines-escape">
|
|
|
|
{{- if $inlineDiff.EscapeStatus.Escaped -}}
|
2023-09-24 20:31:58 +00:00
|
|
|
<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>
|
2023-05-21 20:47:41 +00:00
|
|
|
{{- end -}}
|
|
|
|
</td>
|
2024-03-28 08:31:07 +00:00
|
|
|
<td class="lines-type-marker"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
|
2023-03-06 01:37:58 +00:00
|
|
|
{{if eq .GetType 4}}
|
2024-12-24 16:51:13 +00:00
|
|
|
<td class="chroma lines-code blob-hunk">{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</td>
|
2023-03-06 01:37:58 +00:00
|
|
|
{{else}}
|
2024-12-24 16:51:13 +00:00
|
|
|
<td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">
|
|
|
|
{{- if and $.root.SignedUserID $.root.PageIsPullFiles -}}
|
|
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">
|
|
|
|
{{- svg "octicon-plus" -}}
|
|
|
|
</button>
|
|
|
|
{{- end -}}
|
|
|
|
{{- template "repo/diff/section_code" dict "diff" $inlineDiff -}}
|
|
|
|
</td>
|
2020-08-08 01:22:34 +00:00
|
|
|
{{end}}
|
2023-03-06 01:37:58 +00:00
|
|
|
</tr>
|
2023-12-04 21:48:42 +00:00
|
|
|
{{if $line.Comments}}
|
2023-05-07 09:49:46 +00:00
|
|
|
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
|
2023-03-06 01:37:58 +00:00
|
|
|
<td class="add-comment-left add-comment-right" colspan="5">
|
2023-04-07 14:39:08 +00:00
|
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
2023-03-06 01:37:58 +00:00
|
|
|
</td>
|
|
|
|
</tr>
|
2018-08-06 04:43:22 +00:00
|
|
|
{{end}}
|
2016-08-28 11:31:42 +00:00
|
|
|
{{end}}
|
2018-08-06 04:43:22 +00:00
|
|
|
{{end}}
|