diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-05-07 17:49:46 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-07 09:49:46 +0000 |
commit | 56ae853ca0f7255cc669d802b741922fd8670c3b (patch) | |
tree | 132ba83a8a238e1119738416083f17c668ee3442 /templates/repo | |
parent | 377e0139b0233f2b5419af42ad783f82cf9ce0ba (diff) | |
download | gitea-56ae853ca0f7255cc669d802b741922fd8670c3b.tar.gz gitea-56ae853ca0f7255cc669d802b741922fd8670c3b.zip |
Simplify template helper functions (#24570)
To avoid bloating the template helper functions, some functions could be
provided by type methods.
And the new code `data-line-type="{{.GetHTMLDiffLineType}}"` reads
better than `data-line-type="{{DiffLineTypeToStr .GetType}}"`
After the fix, screenshots (the same as before):
<details>
![image](https://user-images.githubusercontent.com/2114189/236657918-20ce01e0-1192-443e-aeb4-6b3fe1aa2102.png)
![image](https://user-images.githubusercontent.com/2114189/236657950-ee19727f-a1fc-4133-afc7-e5d1a8c1783f.png)
</details>
Diffstat (limited to 'templates/repo')
-rw-r--r-- | templates/repo/diff/blob_excerpt.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/diff/section_split.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/diff/section_unified.tmpl | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index caa428dc28..7e11b33ba6 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -1,6 +1,6 @@ {{if $.IsSplitStyle}} {{range $k, $line := $.section.Lines}} - <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> + <tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}"> {{if eq .GetType 4}} <td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} @@ -44,7 +44,7 @@ {{end}} {{else}} {{range $k, $line := $.section.Lines}} - <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}"> + <tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}"> {{if eq .GetType 4}} <td colspan="2" class="lines-num"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} diff --git a/templates/repo/diff/section_split.tmpl b/templates/repo/diff/section_split.tmpl index e44c2a0f73..42aed85084 100644 --- a/templates/repo/diff/section_split.tmpl +++ b/templates/repo/diff/section_split.tmpl @@ -13,7 +13,7 @@ {{range $k, $line := $section.Lines}} {{$hasmatch := ne $line.Match -1}} {{if or (ne .GetType 2) (not $hasmatch)}} - <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{DiffLineTypeToStr .GetType}}"> + <tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}"> {{if eq .GetType 4}} <td class="lines-num lines-num-old"> {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} @@ -107,7 +107,7 @@ {{if and (eq .GetType 3) $hasmatch}} {{$match := index $section.Lines $line.Match}} {{if or (gt (len $line.Comments) 0) (gt (len $match.Comments) 0)}} - <tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}"> + <tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}"> <td class="add-comment-left" colspan="4"> {{if gt (len $line.Comments) 0}} {{if eq $line.GetCommentSide "previous"}} @@ -133,7 +133,7 @@ </tr> {{end}} {{else if gt (len $line.Comments) 0}} - <tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}"> + <tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}"> <td class="add-comment-left" colspan="4"> {{if gt (len $line.Comments) 0}} {{if eq $line.GetCommentSide "previous"}} diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index cdd2c26f81..8bf331f6db 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -8,7 +8,7 @@ </colgroup> {{range $j, $section := $file.Sections}} {{range $k, $line := $section.Lines}} - <tr class="{{DiffLineTypeToStr .GetType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{DiffLineTypeToStr .GetType}}"> + <tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}"> {{if eq .GetType 4}} {{if $.root.AfterCommitID}} <td colspan="2" class="lines-num"> @@ -55,7 +55,7 @@ {{end}} </tr> {{if gt (len $line.Comments) 0}} - <tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}"> + <tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}"> <td class="add-comment-left add-comment-right" colspan="5"> {{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}} </td> |