mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-10 20:22:14 +02:00
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>
This commit is contained in:
parent
377e0139b0
commit
56ae853ca0
6 changed files with 20 additions and 21 deletions
|
@ -179,7 +179,6 @@ func NewFuncMap() template.FuncMap {
|
||||||
|
|
||||||
// -----------------------------------------------------------------
|
// -----------------------------------------------------------------
|
||||||
// misc
|
// misc
|
||||||
"DiffLineTypeToStr": DiffLineTypeToStr,
|
|
||||||
"ShortSha": base.ShortSha,
|
"ShortSha": base.ShortSha,
|
||||||
"ActionContent2Commits": ActionContent2Commits,
|
"ActionContent2Commits": ActionContent2Commits,
|
||||||
"IsMultilineCommitMessage": IsMultilineCommitMessage,
|
"IsMultilineCommitMessage": IsMultilineCommitMessage,
|
||||||
|
|
|
@ -122,19 +122,6 @@ func ActionContent2Commits(act Actioner) *repository.PushCommits {
|
||||||
return push
|
return push
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiffLineTypeToStr returns diff line type name
|
|
||||||
func DiffLineTypeToStr(diffType int) string {
|
|
||||||
switch diffType {
|
|
||||||
case 2:
|
|
||||||
return "add"
|
|
||||||
case 3:
|
|
||||||
return "del"
|
|
||||||
case 4:
|
|
||||||
return "tag"
|
|
||||||
}
|
|
||||||
return "same"
|
|
||||||
}
|
|
||||||
|
|
||||||
// MigrationIcon returns a SVG name matching the service an issue/comment was migrated from
|
// MigrationIcon returns a SVG name matching the service an issue/comment was migrated from
|
||||||
func MigrationIcon(hostname string) string {
|
func MigrationIcon(hostname string) string {
|
||||||
switch hostname {
|
switch hostname {
|
||||||
|
|
|
@ -104,6 +104,19 @@ func (d *DiffLine) GetType() int {
|
||||||
return int(d.Type)
|
return int(d.Type)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetHTMLDiffLineType returns the diff line type name for HTML
|
||||||
|
func (d *DiffLine) GetHTMLDiffLineType() string {
|
||||||
|
switch d.Type {
|
||||||
|
case DiffLineAdd:
|
||||||
|
return "add"
|
||||||
|
case DiffLineDel:
|
||||||
|
return "del"
|
||||||
|
case DiffLineSection:
|
||||||
|
return "tag"
|
||||||
|
}
|
||||||
|
return "same"
|
||||||
|
}
|
||||||
|
|
||||||
// CanComment returns whether a line can get commented
|
// CanComment returns whether a line can get commented
|
||||||
func (d *DiffLine) CanComment() bool {
|
func (d *DiffLine) CanComment() bool {
|
||||||
return len(d.Comments) == 0 && d.Type != DiffLineSection
|
return len(d.Comments) == 0 && d.Type != DiffLineSection
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{{if $.IsSplitStyle}}
|
{{if $.IsSplitStyle}}
|
||||||
{{range $k, $line := $.section.Lines}}
|
{{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}}
|
{{if eq .GetType 4}}
|
||||||
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}">
|
<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)}}
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
{{else}}
|
{{else}}
|
||||||
{{range $k, $line := $.section.Lines}}
|
{{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}}
|
{{if eq .GetType 4}}
|
||||||
<td colspan="2" class="lines-num">
|
<td colspan="2" class="lines-num">
|
||||||
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
{{range $k, $line := $section.Lines}}
|
{{range $k, $line := $section.Lines}}
|
||||||
{{$hasmatch := ne $line.Match -1}}
|
{{$hasmatch := ne $line.Match -1}}
|
||||||
{{if or (ne .GetType 2) (not $hasmatch)}}
|
{{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}}
|
{{if eq .GetType 4}}
|
||||||
<td class="lines-num lines-num-old">
|
<td class="lines-num lines-num-old">
|
||||||
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
|
{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
|
||||||
|
@ -107,7 +107,7 @@
|
||||||
{{if and (eq .GetType 3) $hasmatch}}
|
{{if and (eq .GetType 3) $hasmatch}}
|
||||||
{{$match := index $section.Lines $line.Match}}
|
{{$match := index $section.Lines $line.Match}}
|
||||||
{{if or (gt (len $line.Comments) 0) (gt (len $match.Comments) 0)}}
|
{{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">
|
<td class="add-comment-left" colspan="4">
|
||||||
{{if gt (len $line.Comments) 0}}
|
{{if gt (len $line.Comments) 0}}
|
||||||
{{if eq $line.GetCommentSide "previous"}}
|
{{if eq $line.GetCommentSide "previous"}}
|
||||||
|
@ -133,7 +133,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{else if gt (len $line.Comments) 0}}
|
{{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">
|
<td class="add-comment-left" colspan="4">
|
||||||
{{if gt (len $line.Comments) 0}}
|
{{if gt (len $line.Comments) 0}}
|
||||||
{{if eq $line.GetCommentSide "previous"}}
|
{{if eq $line.GetCommentSide "previous"}}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
</colgroup>
|
</colgroup>
|
||||||
{{range $j, $section := $file.Sections}}
|
{{range $j, $section := $file.Sections}}
|
||||||
{{range $k, $line := $section.Lines}}
|
{{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 eq .GetType 4}}
|
||||||
{{if $.root.AfterCommitID}}
|
{{if $.root.AfterCommitID}}
|
||||||
<td colspan="2" class="lines-num">
|
<td colspan="2" class="lines-num">
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
</tr>
|
</tr>
|
||||||
{{if gt (len $line.Comments) 0}}
|
{{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">
|
<td class="add-comment-left add-comment-right" colspan="5">
|
||||||
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
||||||
</td>
|
</td>
|
||||||
|
|
Loading…
Reference in a new issue