mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-26 06:16:56 +09:00
wxiaoguang
222136ee71
1. drop comment.commit_id 2. refactor templates, remove `dict "." .` from templates
139 lines
7.5 KiB
Handlebars
139 lines
7.5 KiB
Handlebars
{{$file := $.file -}}
|
|
{{$diffBlobExcerptData := ctx.RootData.DiffBlobExcerptData -}}
|
|
{{$canAddComment := and ctx.RootData.SignedUserID $diffBlobExcerptData.PullIssueIndex -}}
|
|
<colgroup>
|
|
<col width="50">
|
|
<col width="10">
|
|
<col width="10">
|
|
<col>
|
|
<col width="50">
|
|
<col width="10">
|
|
<col width="10">
|
|
<col>
|
|
</colgroup>
|
|
{{range $section := $file.Sections}}
|
|
{{range $line := $section.Lines}}
|
|
{{$hasMatch := ne $line.Match -1}}
|
|
{{if or (not $line.IsDiffLineAdd) (not $hasMatch)}}
|
|
<tr class="{{$line.GetHTMLDiffLineType}}-code" data-line-type="{{$line.GetHTMLDiffLineType}}">
|
|
{{if $line.IsDiffLineSection}}
|
|
{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale}}
|
|
<td class="lines-num lines-num-old">{{$line.RenderBlobExcerptButtons $file.NameHash $diffBlobExcerptData}}</td>
|
|
<td class="lines-escape lines-escape-old">{{ctx.RenderUtils.RenderUnicodeEscapeToggleButton $inlineDiff.EscapeStatus}}</td>
|
|
<td colspan="6" class="lines-code lines-code-old">{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</td>
|
|
{{else if and $line.IsDiffLineDel $hasMatch}}
|
|
{{$match := index $section.Lines $line.Match}}
|
|
{{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor $line ctx.Locale}}{{end}}
|
|
{{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor $match ctx.Locale}}{{end}}
|
|
<td class="lines-num lines-num-old del-code" data-line-num="{{$line.LeftIdx}}"><span rel="diff-{{$file.NameHash}}L{{$line.LeftIdx}}"></span></td>
|
|
<td class="lines-escape del-code lines-escape-old">{{if $line.LeftIdx}}{{ctx.RenderUtils.RenderUnicodeEscapeToggleButton $leftDiff.EscapeStatus}}{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-old del-code"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
|
|
<td class="lines-code lines-code-old del-code">
|
|
{{- if $canAddComment -}}
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment {{if (not $line.CanComment)}}tw-invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">
|
|
{{- svg "octicon-plus" -}}
|
|
</button>
|
|
{{- end -}}
|
|
{{- if $line.LeftIdx -}}
|
|
{{- template "repo/diff/section_code" dict "diff" $leftDiff -}}
|
|
{{- else -}}
|
|
<code class="code-inner"></code>
|
|
{{- end -}}
|
|
</td>
|
|
<td class="lines-num lines-num-new add-code" data-line-num="{{if $match.RightIdx}}{{$match.RightIdx}}{{end}}"><span rel="{{if $match.RightIdx}}diff-{{$file.NameHash}}R{{$match.RightIdx}}{{end}}"></span></td>
|
|
<td class="lines-escape add-code lines-escape-new">{{if $match.RightIdx}}{{ctx.RenderUtils.RenderUnicodeEscapeToggleButton $rightDiff.EscapeStatus}}{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-new add-code">{{if $match.RightIdx}}<span class="tw-font-mono" data-type-marker="{{$match.GetLineTypeMarker}}"></span>{{end}}</td>
|
|
<td class="lines-code lines-code-new add-code">
|
|
{{- if $canAddComment -}}
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment {{if (not $match.CanComment)}} tw-invisible{{end}}" data-side="right" data-idx="{{$match.RightIdx}}">
|
|
{{- svg "octicon-plus" -}}
|
|
</button>
|
|
{{- end -}}
|
|
{{- if $match.RightIdx -}}
|
|
{{- template "repo/diff/section_code" dict "diff" $rightDiff -}}
|
|
{{- else -}}
|
|
<code class="code-inner"></code>
|
|
{{- end -}}
|
|
</td>
|
|
{{else}}
|
|
{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale}}
|
|
<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-escape lines-escape-old">{{if $line.LeftIdx}}{{ctx.RenderUtils.RenderUnicodeEscapeToggleButton $inlineDiff.EscapeStatus}}{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
|
|
<td class="lines-code lines-code-old">
|
|
{{- if and $canAddComment (not $line.IsDiffLineAdd) -}}
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment {{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">
|
|
{{- svg "octicon-plus" -}}
|
|
</button>
|
|
{{- end -}}
|
|
{{- if $line.LeftIdx -}}
|
|
{{- template "repo/diff/section_code" dict "diff" $inlineDiff -}}
|
|
{{- else -}}
|
|
<code class="code-inner"></code>
|
|
{{- end -}}
|
|
</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>
|
|
<td class="lines-escape lines-escape-new">{{if $line.RightIdx}}{{ctx.RenderUtils.RenderUnicodeEscapeToggleButton $inlineDiff.EscapeStatus}}{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
|
|
<td class="lines-code lines-code-new">
|
|
{{- if and $canAddComment (not $line.IsDiffLineDel) -}}
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment {{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}">
|
|
{{- svg "octicon-plus" -}}
|
|
</button>
|
|
{{- end -}}
|
|
{{- if $line.RightIdx -}}
|
|
{{- template "repo/diff/section_code" dict "diff" $inlineDiff -}}
|
|
{{- else -}}
|
|
<code class="code-inner"></code>
|
|
{{- end -}}
|
|
</td>
|
|
{{end}}
|
|
</tr>
|
|
{{if and $line.IsDiffLineDel $hasMatch}}
|
|
{{$match := index $section.Lines $line.Match}}
|
|
{{if or $line.Comments $match.Comments}}
|
|
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
|
|
<td class="add-comment-left" colspan="4">
|
|
{{if $line.Comments}}
|
|
{{if eq $line.GetCommentSide "previous"}}
|
|
{{template "repo/diff/conversation" dict "comments" $line.Comments}}
|
|
{{end}}
|
|
{{end}}
|
|
{{if $match.Comments}}
|
|
{{if eq $match.GetCommentSide "previous"}}
|
|
{{template "repo/diff/conversation" dict "comments" $match.Comments}}
|
|
{{end}}
|
|
{{end}}
|
|
</td>
|
|
<td class="add-comment-right" colspan="4">
|
|
{{if $line.Comments}}
|
|
{{if eq $line.GetCommentSide "proposed"}}
|
|
{{template "repo/diff/conversation" dict "comments" $line.Comments}}
|
|
{{end}}
|
|
{{end}}
|
|
{{if $match.Comments}}
|
|
{{if eq $match.GetCommentSide "proposed"}}
|
|
{{template "repo/diff/conversation" dict "comments" $match.Comments}}
|
|
{{end}}
|
|
{{end}}
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
{{else if $line.Comments}}
|
|
<tr class="add-comment" data-line-type="{{$line.GetHTMLDiffLineType}}">
|
|
<td class="add-comment-left" colspan="4">
|
|
{{if eq $line.GetCommentSide "previous"}}
|
|
{{template "repo/diff/conversation" dict "comments" $line.Comments}}
|
|
{{end}}
|
|
</td>
|
|
<td class="add-comment-right" colspan="4">
|
|
{{if eq $line.GetCommentSide "proposed"}}
|
|
{{template "repo/diff/conversation" dict "comments" $line.Comments}}
|
|
{{end}}
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|