mirror of
https://github.com/go-gitea/gitea
synced 2024-12-23 19:36:20 +01:00
a4f977e00b
Backport #31431 by @charles7668 close #31149 The problem is caused by the `data-query=` string affecting the parsing of the `last_left` parameter. When the page is first rendered, `data-query=` does not exist. However, after clicking expand, the returned HTML contains this string, causing the line numbers to start from 1 upon expanding a second time. before fix  after fix  Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>
83 lines
5.8 KiB
Handlebars
83 lines
5.8 KiB
Handlebars
{{if $.IsSplitStyle}}
|
|
{{range $k, $line := $.section.Lines}}
|
|
<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}} line-expanded">
|
|
{{if eq .GetType 4}}
|
|
{{$expandDirection := $line.GetExpandDirection}}
|
|
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}">
|
|
<div class="code-expander-buttons" data-expand-direction="{{$expandDirection}}">
|
|
{{if or (eq $expandDirection 3) (eq $expandDirection 5)}}
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=split&direction=down&wiki={{$.PageIsWiki}}&anchor={{$.Anchor}}">
|
|
{{svg "octicon-fold-down"}}
|
|
</button>
|
|
{{end}}
|
|
{{if or (eq $expandDirection 3) (eq $expandDirection 4)}}
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=split&direction=up&wiki={{$.PageIsWiki}}&anchor={{$.Anchor}}">
|
|
{{svg "octicon-fold-up"}}
|
|
</button>
|
|
{{end}}
|
|
{{if eq $expandDirection 2}}
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=split&direction=&wiki={{$.PageIsWiki}}&anchor={{$.Anchor}}">
|
|
{{svg "octicon-fold"}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
</td>
|
|
<td colspan="7" class="lines-code lines-code-old ">{{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}{{/*
|
|
*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</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-{{$.FileNameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
|
|
<td class="lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td>
|
|
<td class="lines-code lines-code-old">{{/*
|
|
*/}}{{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-{{$.FileNameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
|
|
<td class="lines-escape lines-escape-new">{{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
|
|
<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td>
|
|
<td class="lines-code lines-code-new">{{/*
|
|
*/}}{{if $line.RightIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff}}{{else}}{{/*
|
|
*/}}<code class="code-inner"></code>{{/*
|
|
*/}}{{end}}{{/*
|
|
*/}}</td>
|
|
{{end}}
|
|
</tr>
|
|
{{end}}
|
|
{{else}}
|
|
{{range $k, $line := $.section.Lines}}
|
|
<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}} line-expanded">
|
|
{{if eq .GetType 4}}
|
|
{{$expandDirection := $line.GetExpandDirection}}
|
|
<td colspan="2" class="lines-num">
|
|
<div class="code-expander-buttons" data-expand-direction="{{$expandDirection}}">
|
|
{{if or (eq $expandDirection 3) (eq $expandDirection 5)}}
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=down&wiki={{$.PageIsWiki}}&anchor={{$.Anchor}}">
|
|
{{svg "octicon-fold-down"}}
|
|
</button>
|
|
{{end}}
|
|
{{if or (eq $expandDirection 3) (eq $expandDirection 4)}}
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=up&wiki={{$.PageIsWiki}}&anchor={{$.Anchor}}">
|
|
{{svg "octicon-fold-up"}}
|
|
</button>
|
|
{{end}}
|
|
{{if eq $expandDirection 2}}
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$.RepoLink}}/blob_excerpt/{{PathEscape $.AfterCommitID}}?{{$line.GetBlobExcerptQuery}}&style=unified&direction=&wiki={{$.PageIsWiki}}&anchor={{$.Anchor}}">
|
|
{{svg "octicon-fold"}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
</td>
|
|
{{else}}
|
|
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$.FileNameHash}}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-{{$.FileNameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
|
|
{{end}}
|
|
{{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}
|
|
<td class="lines-escape">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
|
|
<td class="lines-type-marker"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
|
|
<td class="lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td>
|
|
</tr>
|
|
{{end}}
|
|
{{end}}
|