2018-08-05 22:43:22 -06:00
|
|
|
{{$file := .file}}
|
2024-05-20 01:40:14 -06:00
|
|
|
{{$blobExcerptRepoLink := or ctx.RootData.CommitRepoLink ctx.RootData.RepoLink}}
|
2023-04-04 05:05:07 -06:00
|
|
|
<colgroup>
|
|
|
|
<col width="50">
|
|
|
|
<col width="50">
|
|
|
|
<col width="10">
|
|
|
|
<col width="10">
|
|
|
|
<col>
|
|
|
|
</colgroup>
|
2016-08-28 05:31:42 -06:00
|
|
|
{{range $j, $section := $file.Sections}}
|
|
|
|
{{range $k, $line := $section.Lines}}
|
2023-05-07 03:49:46 -06:00
|
|
|
<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}">
|
2023-03-05 18:37:58 -07:00
|
|
|
{{if eq .GetType 4}}
|
|
|
|
{{if $.root.AfterCommitID}}
|
2020-08-07 19:22:34 -06:00
|
|
|
<td colspan="2" class="lines-num">
|
2024-03-22 07:45:10 -06:00
|
|
|
<div class="tw-flex">
|
2023-05-21 14:47:41 -06:00
|
|
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
|
2024-05-20 01:40:14 -06:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptRepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=down&wiki={{$.root.PageIsWiki}}&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2023-05-21 14:47:41 -06:00
|
|
|
{{svg "octicon-fold-down"}}
|
|
|
|
</button>
|
|
|
|
{{end}}
|
|
|
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}}
|
2024-05-20 01:40:14 -06:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptRepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=up&wiki={{$.root.PageIsWiki}}&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2023-05-21 14:47:41 -06:00
|
|
|
{{svg "octicon-fold-up"}}
|
|
|
|
</button>
|
|
|
|
{{end}}
|
|
|
|
{{if eq $line.GetExpandDirection 2}}
|
2024-05-20 01:40:14 -06:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptRepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=&wiki={{$.root.PageIsWiki}}&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2023-05-21 14:47:41 -06:00
|
|
|
{{svg "octicon-fold"}}
|
|
|
|
</button>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
2020-08-07 19:22:34 -06:00
|
|
|
</td>
|
|
|
|
{{else}}
|
2023-03-05 18:37:58 -07: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-14 19:52:59 -07:00
|
|
|
{{end}}
|
2023-03-05 18:37:58 -07: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 06:42:40 -06:00
|
|
|
{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale -}}
|
2023-05-21 14:47:41 -06:00
|
|
|
<td class="lines-escape">
|
|
|
|
{{- if $inlineDiff.EscapeStatus.Escaped -}}
|
2023-09-24 14:31:58 -06:00
|
|
|
<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>
|
2023-05-21 14:47:41 -06:00
|
|
|
{{- end -}}
|
|
|
|
</td>
|
2024-03-28 02:31:07 -06:00
|
|
|
<td class="lines-type-marker"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
|
2023-03-05 18:37:58 -07:00
|
|
|
{{if eq .GetType 4}}
|
|
|
|
<td class="chroma lines-code blob-hunk">{{/*
|
2023-09-24 14:31:58 -06:00
|
|
|
*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{/*
|
2023-03-05 18:37:58 -07:00
|
|
|
*/}}</td>
|
|
|
|
{{else}}
|
|
|
|
<td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">{{/*
|
|
|
|
*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/*
|
2024-03-04 22:29:32 -07:00
|
|
|
*/}}<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}}">{{/*
|
2023-03-05 18:37:58 -07:00
|
|
|
*/}}{{svg "octicon-plus"}}{{/*
|
2023-07-15 03:45:34 -06:00
|
|
|
*/}}</button>{{/*
|
2023-03-05 18:37:58 -07:00
|
|
|
*/}}{{end}}{{/*
|
2023-09-24 14:31:58 -06:00
|
|
|
*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{/*
|
2023-03-05 18:37:58 -07:00
|
|
|
*/}}</td>
|
2020-08-07 19:22:34 -06:00
|
|
|
{{end}}
|
2023-03-05 18:37:58 -07:00
|
|
|
</tr>
|
2023-12-04 14:48:42 -07:00
|
|
|
{{if $line.Comments}}
|
2023-05-07 03:49:46 -06:00
|
|
|
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
|
2023-03-05 18:37:58 -07:00
|
|
|
<td class="add-comment-left add-comment-right" colspan="5">
|
2023-04-07 08:39:08 -06:00
|
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
2023-03-05 18:37:58 -07:00
|
|
|
</td>
|
|
|
|
</tr>
|
2018-08-05 22:43:22 -06:00
|
|
|
{{end}}
|
2016-08-28 05:31:42 -06:00
|
|
|
{{end}}
|
2018-08-05 22:43:22 -06:00
|
|
|
{{end}}
|