mirror of
				https://gitcode.com/gitea/gitea.git
				synced 2025-10-31 00:19:59 +08:00 
			
		
		
		
	 36c0840cf1
			
		
	
	36c0840cf1
	
	
	
		
			
			One of the steps in #23328 Before there were 3 different but similar functions: dict/Dict/mergeinto The code was just copied & pasted, no test. This PR defines a new stable `dict` function, it covers all the 3 old functions behaviors, only +160 -171 Future developers do not need to think about or guess the different dict functions, just use one: `dict` Why use `dict` but not `Dict`? Because there are far more `dict` than `Dict` in code already ......
		
			
				
	
	
		
			66 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Handlebars
		
	
	
	
	
	
			
		
		
	
	
			66 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Handlebars
		
	
	
	
	
	
| {{$file := .file}}
 | |
| <colgroup>
 | |
| 	<col width="50">
 | |
| 	<col width="50">
 | |
| 	<col width="10">
 | |
| 	<col width="10">
 | |
| 	<col>
 | |
| </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}}">
 | |
| 			{{if eq .GetType 4}}
 | |
| 				{{if $.root.AfterCommitID}}
 | |
| 					<td colspan="2" class="lines-num">
 | |
| 						{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}}
 | |
| 							<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=down&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | |
| 								{{svg "octicon-fold-down"}}
 | |
| 							</a>
 | |
| 						{{end}}
 | |
| 						{{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 4)}}
 | |
| 							<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=up&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | |
| 								{{svg "octicon-fold-up"}}
 | |
| 							</a>
 | |
| 						{{end}}
 | |
| 						{{if eq $line.GetExpandDirection 2}}
 | |
| 							<a role="button" class="blob-excerpt" data-url="{{$.root.RepoLink}}/blob_excerpt/{{PathEscape $.root.AfterCommitID}}" data-query="{{$line.GetBlobExcerptQuery}}&style=unified&direction=&wiki={{$.root.PageIsWiki}}" data-anchor="diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
 | |
| 								{{svg "octicon-fold"}}
 | |
| 							</a>
 | |
| 						{{end}}
 | |
| 					</td>
 | |
| 				{{else}}
 | |
| 					{{/* for code file preview page or comment diffs on pull comment pages, do not show the expansion arrows */}}
 | |
| 					<td colspan="2" class="lines-num"></td>
 | |
| 				{{end}}
 | |
| 			{{else}}
 | |
| 				<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-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>
 | |
| 			{{end}}
 | |
| 			{{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale -}}
 | |
| 			<td class="lines-escape">{{if $inlineDiff.EscapeStatus.Escaped}}<a href="" class="toggle-escape-button" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff "locale" $.root.locale}}"></a>{{end}}</td>
 | |
| 			<td class="lines-type-marker"><span class="gt-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
 | |
| 			{{if eq .GetType 4}}
 | |
| 				<td class="chroma lines-code blob-hunk">{{/*
 | |
| 					*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
 | |
| 				*/}}</td>
 | |
| 			{{else}}
 | |
| 				<td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">{{/*
 | |
| 					*/}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/*
 | |
| 						*/}}<a class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">{{/*
 | |
| 							*/}}{{svg "octicon-plus"}}{{/*
 | |
| 						*/}}</a>{{/*
 | |
| 					*/}}{{end}}{{/*
 | |
| 					*/}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/*
 | |
| 				*/}}</td>
 | |
| 			{{end}}
 | |
| 		</tr>
 | |
| 		{{if gt (len $line.Comments) 0}}
 | |
| 			<tr class="add-comment" data-line-type="{{DiffLineTypeToStr .GetType}}">
 | |
| 				<td class="add-comment-left add-comment-right" colspan="5">
 | |
| 					{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
 | |
| 				</td>
 | |
| 			</tr>
 | |
| 		{{end}}
 | |
| 	{{end}}
 | |
| {{end}}
 |