mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-03 04:48:25 +00:00 
			
		
		
		
	Visually, nothing should have changed. Changes include - Convert most `<a [no href]>` to `<button>` when (re-)viewing files: - `<a [no href]>` are, by HTML definition, not a link and hence cannot be focused - `<a class="ui button">` can now be clicked (again?) using <kbd>Enter</kbd> - Previously, the installed keypress handler on `.ui.button` elements disabled it for links somehow - The `(un)escape file`, the `expand section` and the `expand/collapse file` buttons can now be focused (and subsequently clicked using only the keyboard) - You can now press <kbd>Space</kbd> on a focused `View file` checkbox to mark the file as viewed. - previously, this was impossible as this checkbox listened on the wrong event listener The `add code comment` button has been left inaccessible for now as it requires quite a bit of extra logic so that it is unhidden when it is focused (you can otherwise focus it without seeing it as you are not hovering on the corresponding line). --------- Co-authored-by: silverwind <me@silverwind.io>
		
			
				
	
	
		
			156 lines
		
	
	
		
			9.5 KiB
		
	
	
	
		
			Handlebars
		
	
	
	
	
	
			
		
		
	
	
			156 lines
		
	
	
		
			9.5 KiB
		
	
	
	
		
			Handlebars
		
	
	
	
	
	
{{$file := .file}}
 | 
						|
<colgroup>
 | 
						|
	<col width="50">
 | 
						|
	<col width="10">
 | 
						|
	<col width="10">
 | 
						|
	<col>
 | 
						|
	<col width="50">
 | 
						|
	<col width="10">
 | 
						|
	<col width="10">
 | 
						|
	<col>
 | 
						|
</colgroup>
 | 
						|
{{range $j, $section := $file.Sections}}
 | 
						|
	{{range $k, $line := $section.Lines}}
 | 
						|
		{{$hasmatch := ne $line.Match -1}}
 | 
						|
		{{if or (ne .GetType 2) (not $hasmatch)}}
 | 
						|
			<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}">
 | 
						|
				{{if eq .GetType 4}}
 | 
						|
					<td class="lines-num lines-num-old">
 | 
						|
						<div class="gt-df">
 | 
						|
						{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
 | 
						|
							<button class="code-expander-button" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=down&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | 
						|
								{{svg "octicon-fold-down"}}
 | 
						|
							</button>
 | 
						|
						{{end}}
 | 
						|
						{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}}
 | 
						|
							<button class="code-expander-button" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=up&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | 
						|
								{{svg "octicon-fold-up"}}
 | 
						|
							</button>
 | 
						|
						{{end}}
 | 
						|
						{{if eq $line.GetExpandDirection 2}}
 | 
						|
							<button class="code-expander-button" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=split&direction=&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | 
						|
								{{svg "octicon-fold"}}
 | 
						|
							</button>
 | 
						|
						{{end}}
 | 
						|
						</div>
 | 
						|
					</td>{{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale}}
 | 
						|
					<td class="lines-escape lines-escape-old">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button button button-ghost" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}</td>
 | 
						|
					<td colspan="6" class="lines-code lines-code-old ">{{/*
 | 
						|
						*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
 | 
						|
					*/}}</td>
 | 
						|
				{{else if and (eq .GetType 3) $hasmatch}}{{/* DEL */}}
 | 
						|
					{{$match := index $section.Lines $line.Match}}
 | 
						|
					{{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor $line $.root.locale}}{{end}}
 | 
						|
					{{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor $match $.root.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}}{{if $leftDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button button button-ghost" title="{{template "repo/diff/escape_title" dict "diff" $leftDiff "locale" $.root.locale}}"></a>{{end}}{{end}}</td>
 | 
						|
					<td class="lines-type-marker lines-type-marker-old del-code"><span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
 | 
						|
					<td class="lines-code lines-code-old del-code">{{/*
 | 
						|
						*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/*
 | 
						|
							*/}}<a class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/*
 | 
						|
								*/}}{{svg "octicon-plus"}}{{/*
 | 
						|
							*/}}</a>{{/*
 | 
						|
						*/}}{{end}}{{/*
 | 
						|
						*/}}{{if $line.LeftIdx}}{{/*
 | 
						|
							*/}}{{template "repo/diff/section_code" dict "diff" $leftDiff "locale" $.root.locale}}{{/*
 | 
						|
						*/}}{{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}}{{if $rightDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button button button-ghost" title="{{template "repo/diff/escape_title" dict "diff" $rightDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td>
 | 
						|
					<td class="lines-type-marker lines-type-marker-new add-code">{{if $match.RightIdx}}<span class="gt-mono" data-type-marker="{{$match.GetLineTypeMarker}}"></span>{{end}}</td>
 | 
						|
					<td class="lines-code lines-code-new add-code">{{/*
 | 
						|
						*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/*
 | 
						|
							*/}}<a class="ui primary button add-code-comment add-code-comment-right{{if (not $match.CanComment)}} invisible{{end}}" data-side="right" data-idx="{{$match.RightIdx}}">{{/*
 | 
						|
								*/}}{{svg "octicon-plus"}}{{/*
 | 
						|
							*/}}</a>{{/*
 | 
						|
						*/}}{{end}}{{/*
 | 
						|
						*/}}{{if $match.RightIdx}}{{/*
 | 
						|
							*/}}{{template "repo/diff/section_code" dict "diff" $rightDiff "locale" $.root.locale}}{{/*
 | 
						|
						*/}}{{else}}{{/*
 | 
						|
							*/}}<code class="code-inner"></code>{{/*
 | 
						|
						*/}}{{end}}{{/*
 | 
						|
					*/}}</td>
 | 
						|
				{{else}}
 | 
						|
					{{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.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}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button button button-ghost" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td>
 | 
						|
					<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
 | 
						|
					<td class="lines-code lines-code-old">{{/*
 | 
						|
						*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 2))}}{{/*
 | 
						|
							*/}}<a class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">{{/*
 | 
						|
								*/}}{{svg "octicon-plus"}}{{/*
 | 
						|
							*/}}</a>{{/*
 | 
						|
						*/}}{{end}}{{/*
 | 
						|
						*/}}{{if $line.LeftIdx}}{{/*
 | 
						|
							*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
 | 
						|
						*/}}{{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}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button button button-ghost" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></button>{{end}}{{end}}</td>
 | 
						|
					<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
 | 
						|
					<td class="lines-code lines-code-new">{{/*
 | 
						|
						*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 3))}}{{/*
 | 
						|
							*/}}<a class="ui primary button add-code-comment add-code-comment-right{{if (not $line.CanComment)}} invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}">{{/*
 | 
						|
								*/}}{{svg "octicon-plus"}}{{/*
 | 
						|
							*/}}</a>{{/*
 | 
						|
						*/}}{{end}}{{/*
 | 
						|
						*/}}{{if $line.RightIdx}}{{/*
 | 
						|
							*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
 | 
						|
						*/}}{{else}}{{/*
 | 
						|
						*/}}<code class="code-inner"></code>{{/*
 | 
						|
						*/}}{{end}}{{/*
 | 
						|
					*/}}</td>
 | 
						|
				{{end}}
 | 
						|
			</tr>
 | 
						|
			{{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="{{.GetHTMLDiffLineType}}">
 | 
						|
						<td class="add-comment-left" colspan="4">
 | 
						|
							{{if gt (len $line.Comments) 0}}
 | 
						|
								{{if eq $line.GetCommentSide "previous"}}
 | 
						|
									{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
 | 
						|
								{{end}}
 | 
						|
							{{end}}
 | 
						|
							{{if gt (len $match.Comments) 0}}
 | 
						|
								{{if eq $match.GetCommentSide "previous"}}
 | 
						|
									{{template "repo/diff/conversation" dict "." $.root "comments" $match.Comments}}
 | 
						|
								{{end}}
 | 
						|
							{{end}}
 | 
						|
						</td>
 | 
						|
						<td class="add-comment-right" colspan="4">
 | 
						|
							{{if eq $line.GetCommentSide "proposed"}}
 | 
						|
								{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
 | 
						|
							{{end}}
 | 
						|
							{{if gt (len $match.Comments) 0}}
 | 
						|
								{{if eq $match.GetCommentSide "proposed"}}
 | 
						|
									{{template "repo/diff/conversation" dict "." $.root "comments" $match.Comments}}
 | 
						|
								{{end}}
 | 
						|
							{{end}}
 | 
						|
						</td>
 | 
						|
					</tr>
 | 
						|
				{{end}}
 | 
						|
			{{else if gt (len $line.Comments) 0}}
 | 
						|
				<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"}}
 | 
						|
								{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
 | 
						|
							{{end}}
 | 
						|
						{{end}}
 | 
						|
					</td>
 | 
						|
					<td class="add-comment-right" colspan="4">
 | 
						|
						{{if eq $line.GetCommentSide "proposed"}}
 | 
						|
							{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
 | 
						|
						{{end}}
 | 
						|
					</td>
 | 
						|
				</tr>
 | 
						|
			{{end}}
 | 
						|
		{{end}}
 | 
						|
	{{end}}
 | 
						|
{{end}}
 |